whet 0.0.3 → 0.0.6

package/bin/whet/SourceHash.js

@@ -1,4 +1,7 @@
+import {MaybeArray_Fields_} from "./magic/MaybeArray.js"
+import {Utils} from "./Utils.js"
 import {Register} from "../genes/Register.js"
+import * as Fs from "fs"
 import * as Crypto from "crypto"
 import {Buffer} from "buffer"
 
@@ -9,21 +12,116 @@ class SourceHash extends Register.inherits() {
 	new(bytes) {
 		this.bytes = bytes;
 	}
+	add(hash) {
+		var data = Buffer.alloc(64);
+		this.bytes.copy(data, 0, 0, 32);
+		hash.bytes.copy(data, 32, 0, 32);
+		return SourceHash.fromBytes(data);
+	}
 	toString() {
 		return this.bytes.toString("hex");
 	}
+	static fromFile(path) {
+		return new Promise(function (res, rej) {
+			Fs.readFile(path, function (err, bytes) {
+				if (err != null) {
+					rej(err);
+				} else {
+					res(SourceHash.fromBytes(bytes));
+				};
+			});
+		});
+	}
+	
+	/**
+	* Creates hashes of all files and or content of directories, optionally recursive.
+	*/
+	static fromFiles(paths, filter, recursive) {
+		if (recursive == null) {
+			recursive = true;
+		};
+		var _g = [];
+		var _g1 = 0;
+		var _g2 = MaybeArray_Fields_.makeArray(paths);
+		while (_g1 < _g2.length) {
+			var src = [_g2[_g1]];
+			++_g1;
+			_g.push(new Promise((function (src) {
+				return function (res, rej) {
+					Fs.stat(src[0], (function (src) {
+						return function (err, stats) {
+							if (err != null) {
+								rej(err);
+							} else if (stats.isDirectory()) {
+								Utils.listDirectoryFiles(src[0], recursive).then((function () {
+									return function (files) {
+										res(files);
+									};
+								})());
+							} else {
+								res([src[0]]);
+							};
+						};
+					})(src));
+				};
+			})(src)));
+		};
+		var allFilesProm = _g;
+		return Promise.all(allFilesProm).then(function (arrFiles) {
+			var result = new Array(arrFiles.length);
+			var _g = 0;
+			var _g1 = arrFiles.length;
+			while (_g < _g1) {
+				var i = _g++;
+				var files = arrFiles[i];
+				if (filter != null) {
+					var _g2 = [];
+					var _g3 = 0;
+					var _g4 = files;
+					while (_g3 < _g4.length) {
+						var v = _g4[_g3];
+						++_g3;
+						if (filter(v)) {
+							_g2.push(v);
+						};
+					};
+					files = _g2;
+				};
+				files.sort();
+				var result1 = new Array(files.length);
+				var _g5 = 0;
+				var _g6 = files.length;
+				while (_g5 < _g6) {
+					var i1 = _g5++;
+					result1[i1] = SourceHash.fromFile(files[i1]);
+				};
+				result[i] = Promise.all(result1);
+			};
+			return result;
+		}).then(function (proms) {
+			return Promise.all(proms);
+		}).then(function (allHashes) {
+			var _g = [];
+			var _g_current = 0;
+			var _g_array = allHashes;
+			while (_g_current < _g_array.length) {
+				var e = _g_array[_g_current++];
+				var x = Register.iter(e);
+				while (x.hasNext()) {
+					var x1 = x.next();
+					_g.push(x1);
+				};
+			};
+			var this1 = _g;
+			return SourceHash.merge(...this1);
+		});
+	}
 	static fromBytes(data) {
 		return new SourceHash(Crypto.createHash("sha256").update(data).digest());
 	}
 	static fromString(data) {
 		return SourceHash.fromBytes(Buffer.from(data));
 	}
-	static add(a, b) {
-		var data = Buffer.alloc(64);
-		a.bytes.copy(data, 0, 0, 32);
-		b.bytes.copy(data, 32, 0, 32);
-		return SourceHash.fromBytes(data);
-	}
 	static equals(a, b) {
 		if (a != null && b != null) {
 			return a.bytes.compare(b.bytes) == 0;
@@ -53,7 +151,7 @@ class SourceHash extends Register.inherits() {
 		var h = hash[0];
 		var _g = 1;
 		var _g1 = hash.length;
-		while (_g < _g1) h = SourceHash.add(h, hash[_g++]);
+		while (_g < _g1) h = h.add(hash[_g++]);
 		return h;
 	}
 	static get __name__() {

package/bin/whet/SourceId.d.ts

@@ -8,3 +8,4 @@ export declare class SourceId {
 export declare class RootDir {
 	static fromProject(p: Project): string
 }
+

package/bin/whet/SourceId.js

@@ -1,5 +1,6 @@
-import {Path} from "../haxe/io/Path.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
@@ -7,17 +8,14 @@ const $global = Register.$global
 export const SourceId = Register.global("$hxClasses")["whet._SourceId.SourceId"] = 
 class SourceId {
 	static relativeTo(this1, directory) {
-		var norm = "/" + Path.normalize((directory.charAt(0) == "/") ? HxOverrides.substr(directory, 1, null) : directory);
-		var tmp = (directory.lastIndexOf("/") == directory.length - 1) ? Path.addTrailingSlash(norm) : norm;
-		var s = Path.addTrailingSlash(Path.directory(directory));
-		var norm = "/" + Path.normalize((s.charAt(0) == "/") ? HxOverrides.substr(s, 1, null) : s);
-		if (tmp != ((s.lastIndexOf("/") == s.length - 1) ? Path.addTrailingSlash(norm) : norm)) {
+		if (!SourceId_Fields_.endsWithSlash(directory)) {
 			throw new Error("\"" + directory + "\" is not a directory.");
 		};
 		var tmp;
-		var s = Path.addTrailingSlash(Path.directory(this1));
-		var norm = "/" + Path.normalize((s.charAt(0) == "/") ? HxOverrides.substr(s, 1, null) : s);
-		tmp = ((s.lastIndexOf("/") == s.length - 1) ? Path.addTrailingSlash(norm) : norm).indexOf(directory) == 0;
+		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;
 		if (tmp) {
 			return HxOverrides.substr(this1, directory.length - 1, null);
 		} else {
@@ -25,29 +23,22 @@ class SourceId {
 		};
 	}
 	static getPutInDir(this1, dir) {
-		var norm = "/" + Path.normalize((dir.charAt(0) == "/") ? HxOverrides.substr(dir, 1, null) : dir);
-		var tmp = (dir.lastIndexOf("/") == dir.length - 1) ? Path.addTrailingSlash(norm) : norm;
-		var s = Path.addTrailingSlash(Path.directory(dir));
-		var norm = "/" + Path.normalize((s.charAt(0) == "/") ? HxOverrides.substr(s, 1, null) : s);
-		if (tmp != ((s.lastIndexOf("/") == s.length - 1) ? Path.addTrailingSlash(norm) : norm)) {
+		if (!SourceId_Fields_.endsWithSlash(dir)) {
 			throw new Error("\"" + dir + "\" is not a directory.");
 		};
-		var norm = "/" + Path.normalize(("/".charAt(0) == "/") ? HxOverrides.substr("/", 1, null) : "/");
-		if (dir == (("/".lastIndexOf("/") == "/".length - 1) ? Path.addTrailingSlash(norm) : norm)) {
-			var norm = "/" + Path.normalize((this1.charAt(0) == "/") ? HxOverrides.substr(this1, 1, null) : this1);
-			if (this1.lastIndexOf("/") == this1.length - 1) {
-				return Path.addTrailingSlash(norm);
-			} else {
-				return norm;
-			};
+		var s = "/";
+		s = Path.posix.normalize("/");
+		s = StringTools.replace(s, "\\", "/");
+		if (dir == ((SourceId_Fields_.startsWithSlash(s)) ? s : "/" + s)) {
+			var s = this1;
+			s = Path.posix.normalize(this1);
+			s = StringTools.replace(s, "\\", "/");
+			return (SourceId_Fields_.startsWithSlash(s)) ? s : "/" + s;
 		} else {
 			var s = dir + this1;
-			var norm = "/" + Path.normalize((s.charAt(0) == "/") ? HxOverrides.substr(s, 1, null) : s);
-			if (s.lastIndexOf("/") == s.length - 1) {
-				return Path.addTrailingSlash(norm);
-			} else {
-				return norm;
-			};
+			s = Path.posix.normalize(s);
+			s = StringTools.replace(s, "\\", "/");
+			return (SourceId_Fields_.startsWithSlash(s)) ? s : "/" + s;
 		};
 	}
 	static get __name__() {
@@ -72,3 +63,21 @@ 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 get __name__() {
+		return "whet._SourceId.SourceId_Fields_"
+	}
+	get __class__() {
+		return SourceId_Fields_
+	}
+}
+
+

package/bin/whet/Stone.d.ts

@@ -30,7 +30,8 @@ export declare class Stone<T extends StoneConfig> {
 	protected getCommands(): Command[]
 	
 	/**
-	Get Source for this stone. Goes through the cache.
+	* **Do not override.**
+	* Get Source for this stone. Goes through the cache.
 	*/
 	getSource(): Promise<Source>
 	
@@ -40,6 +41,7 @@ export declare class Stone<T extends StoneConfig> {
 	getHash(): Promise<SourceHash>
 	
 	/**
+	* **Do not override.**
 	* Generates new Source. Used by the cache when needed.
 	* Hash passed should be the same as is this stone's current one. Passed in as optimization.
 	*/
@@ -51,6 +53,7 @@ export declare class Stone<T extends StoneConfig> {
 	protected generateHash(): Promise<SourceHash>
 	
 	/**
+	* Abstract method.
 	* Function that actually generates the source. Passed hash is only non-null
 	* if `generateHash()` is implemented. It can be used for `CacheManager.getDir` and
 	* is passed mainly as optimization.
@@ -67,11 +70,18 @@ export declare class Stone<T extends StoneConfig> {
 	
 	/**
 	* Caches this resource under supplied `path` as a single copy.
+	* @param path
 	* If `path` is a directory, stores the file(s) under that path, using their standard names.
 	* If `path` is a file and this stone generates only single data source, stores it under the supplied path.
-	* If `generate` is true, the source is exported right away.
+	* @param generate If true (default), the source is exported right away.
 	*/
 	setAbsolutePath(path: string, generate?: boolean): Promise<Source>
+	
+	/**
+	* Convenient function to get CWD-relative path from project-relative one.
+	* Useful for pure JS stones.
+	*/
+	cwdPath(path: string): string
 	protected get_cache(): CacheManager
 	toString(): string
 }

package/bin/whet/Stone.js

@@ -1,13 +1,13 @@
 import {StoneId_Fields_} from "./magic/StoneId.js"
 import {CacheStrategy, CacheDurability} from "./cache/Cache.js"
+import {SourceId_Fields_} from "./SourceId.js"
 import {SourceHash} from "./SourceHash.js"
 import {Source} from "./Source.js"
 import {Project} from "./Project.js"
 import {Log} from "./Log.js"
-import {Boot} from "../js/Boot.js"
-import {Path} from "../haxe/io/Path.js"
+import * as Path from "path"
 import {Register} from "../genes/Register.js"
-import {HxOverrides} from "../HxOverrides.js"
+import {StringTools} from "../StringTools.js"
 
 const $global = Register.$global
 
@@ -15,18 +15,18 @@ export const Stone = Register.global("$hxClasses")["whet.Stone"] =
 class Stone extends Register.inherits() {
 	new(config) {
 		this.ignoreFileHash = false;
-		var c = Boot.getClass(this);
-		Log.log(10, ...["Instantiating new Stone.", {"type": c.__name__}]);
+		Log.log(10, ...["Instantiating new Stone.", {"type": StoneId_Fields_.getTypeName(this)}]);
 		if (config == null) {
 			throw new Error("Config must be supplied.");
 		};
 		this.config = config;
-		this.initConfig();
-		this.id = (config.id != null) ? StoneId_Fields_.makeStoneId(config.id) : StoneId_Fields_.makeStoneId(this);
 		this.project = (config.project != null) ? config.project : Project.projects[Project.projects.length - 1];
 		if (this.project == null) {
 			throw new Error("Did not find a project. Create one before creating stones.");
 		};
+		this.project.stones.push(this);
+		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();
@@ -50,7 +50,8 @@ class Stone extends Register.inherits() {
 	}
 	
 	/**
-	Get Source for this stone. Goes through the cache.
+	* **Do not override.**
+	* Get Source for this stone. Goes through the cache.
 	*/
 	getSource() {
 		Log.log(20, ...["Getting source.", {"stone": this}]);
@@ -75,6 +76,7 @@ class Stone extends Register.inherits() {
 	}
 	
 	/**
+	* **Do not override.**
 	* Generates new Source. Used by the cache when needed.
 	* Hash passed should be the same as is this stone's current one. Passed in as optimization.
 	*/
@@ -130,28 +132,38 @@ class Stone extends Register.inherits() {
 	
 	/**
 	* Caches this resource under supplied `path` as a single copy.
+	* @param path
 	* If `path` is a directory, stores the file(s) under that path, using their standard names.
 	* If `path` is a file and this stone generates only single data source, stores it under the supplied path.
-	* If `generate` is true, the source is exported right away.
+	* @param generate If true (default), the source is exported right away.
 	*/
 	setAbsolutePath(path, generate) {
 		if (generate == null) {
 			generate = true;
 		};
-		var norm = "/" + Path.normalize((path.charAt(0) == "/") ? HxOverrides.substr(path, 1, null) : path);
-		this.cacheStrategy = CacheStrategy.AbsolutePath((path.lastIndexOf("/") == path.length - 1) ? Path.addTrailingSlash(norm) : norm, CacheDurability.LimitCountByAge(1));
+		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));
 		if (generate) {
 			return this.getSource();
 		} else {
 			return Promise.resolve(null);
 		};
 	}
+	
+	/**
+	* Convenient function to get CWD-relative path from project-relative one.
+	* Useful for pure JS stones.
+	*/
+	cwdPath(path) {
+		return Path.join("./", this.project.rootDir, path);
+	}
 	get_cache() {
 		return this.project.cache;
 	}
 	toString() {
-		var c = Boot.getClass(this);
-		return "" + this.id + ":" + c.__name__;
+		return "" + this.id + ":" + StoneId_Fields_.getTypeName(this);
 	}
 	static get __name__() {
 		return "whet.Stone"

package/bin/whet/Utils.d.ts

@@ -1,7 +1,9 @@
 import {Buffer} from "buffer"
 
 export declare class Utils {
-	static ensureDirExist(path: string): Promise<any>
+	static makeUnique<T>(val: T, isNotUnique: ((arg0: T) => boolean), modify: ((val: T, variant: number) => T)): T
+	static makeUniqueString(s: string, isNotUnique: ((arg0: string) => boolean)): string
+	static ensureDirExist(dir: string): Promise<any>
 	
 	/**
 	Saves string as UTF-8, creates missing directories if needed.
@@ -13,4 +15,9 @@ export declare class Utils {
 	*/
 	static saveBytes(path: string, bytes: Buffer): Promise<any>
 	static deleteAll(path: string): Promise<any>
+	
+	/**
+	* Returns a list of all files in the directory. Doesn't include inner directories in non-recursive mode.
+	*/
+	static listDirectoryFiles(dir: string, recursive?: boolean): Promise<string[]>
 }

package/bin/whet/Utils.js

@@ -8,8 +8,19 @@ const $global = Register.$global
 
 export const Utils = Register.global("$hxClasses")["whet.Utils"] = 
 class Utils {
-	static ensureDirExist(path) {
-		var dir = Path.dirname(path);
+	static makeUnique(val, isNotUnique, modify) {
+		var unique = val;
+		var counter = 0;
+		while (isNotUnique(unique)) unique = modify(val, ++counter);
+		return unique;
+	}
+	static makeUniqueString(s, isNotUnique) {
+		var unique = s;
+		var counter = 0;
+		while (isNotUnique(unique)) unique = s + ++counter;
+		return unique;
+	}
+	static ensureDirExist(dir) {
 		var this1 = ["Ensuring directory " + dir + " exists."];
 		Log.log(10, ...this1);
 		return new Promise(function (res, rej) {
@@ -43,7 +54,7 @@ class Utils {
 	*/
 	static saveBytes(path, bytes) {
 		Log.log(10, ...["Writing bytes to " + path + "."]);
-		return Utils.ensureDirExist(path).then(function (_) {
+		return Utils.ensureDirExist(Path.dirname(path)).then(function (_) {
 			return new Promise(function (res, rej) {
 				Fs.writeFile(path, bytes, function (err) {
 					if (err != null) {
@@ -62,6 +73,48 @@ class Utils {
 });
 		});
 	}
+	
+	/**
+	* Returns a list of all files in the directory. Doesn't include inner directories in non-recursive mode.
+	*/
+	static listDirectoryFiles(dir, recursive) {
+		if (recursive == null) {
+			recursive = true;
+		};
+		return new Promise(function (res, rej) {
+			var result = [];
+			Fs.readdir(dir, { withFileTypes : true}, function(err,files) {
+	if(err != null) {
+		rej(err);
+	} else {
+		var otherDirs = [];
+		var _g = 0;
+		while(_g < files.length) {
+			var file = files[_g];
+			++_g;
+			var path = Path.join(dir,file.name);
+			if(file.isDirectory()) {
+				if(recursive) {
+					otherDirs.push(Utils.listDirectoryFiles(path,true));
+				}
+			} else {
+				result.push(path);
+			}
+		}
+		Promise.all(otherDirs).then(function(arr) {
+			var _g = 0;
+			while(_g < arr.length) {
+				var a = arr[_g];
+				++_g;
+				var _g1 = 0;
+				while(_g1 < a.length) result.push(a[_g1++]);
+			}
+			res(result);
+		});
+	}
+});
+		});
+	}
 	static get __name__() {
 		return "whet.Utils"
 	}

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.3", "-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.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.parse();
 		var options = Whet_Fields_.program.opts();
 		if (options.logLevel != null) {
@@ -38,6 +38,9 @@ class Whet_Fields_ {
 				Whet_Fields_.initProjects();
 			})["catch"](function (e) {
 				Log.log(50, ...["Error loading project.", {"error": e}]);
+				if (((e) instanceof Error)) {
+					Log.log(50, ...[e.stack]);
+				};
 				return Whet_Fields_.program.help();
 			});
 		};
@@ -64,6 +67,7 @@ class Whet_Fields_ {
 				var p = _g1[_g];
 				++_g;
 				if (p.onInit != null) {
+					Log.log(10, ...["Initializing project.", {"project": p.id}]);
 					var prom = p.onInit(Whet_Fields_.program.opts());
 					if (prom != null) {
 						promises.push(prom);

package/bin/whet/cache/BaseCache.js

@@ -1,10 +1,11 @@
 import {Cache} from "./Cache.js"
-import {SourceId} from "../SourceId.js"
+import {SourceId_Fields_, 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 {Path} from "../../haxe/io/Path.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"
@@ -14,11 +15,7 @@ const $global = Register.$global
 export const BaseCache = Register.global("$hxClasses")["whet.cache.BaseCache"] = 
 class BaseCache extends Register.inherits() {
 	new(rootDir, cache) {
-		var norm = "/" + Path.normalize((rootDir.charAt(0) == "/") ? HxOverrides.substr(rootDir, 1, null) : rootDir);
-		var tmp = (rootDir.lastIndexOf("/") == rootDir.length - 1) ? Path.addTrailingSlash(norm) : norm;
-		var s = Path.addTrailingSlash(Path.directory(rootDir));
-		var norm = "/" + Path.normalize((s.charAt(0) == "/") ? HxOverrides.substr(s, 1, null) : s);
-		if (tmp != ((s.lastIndexOf("/") == s.length - 1) ? Path.addTrailingSlash(norm) : norm)) {
+		if (!SourceId_Fields_.endsWithSlash(rootDir)) {
 			throw new Error("Root dir is a not a dir.");
 		};
 		this.rootDir = rootDir;
@@ -26,16 +23,16 @@ class BaseCache extends Register.inherits() {
 	}
 	get(stone, durability, check) {
 		var _gthis = this;
-		Log.log(20, ...["Looking for cached source.", {"stone": stone, "cache": this}]);
 		return stone.generateHash().then(function (hash) {
 			if (hash == null) {
-				Log.log(10, ...["Generating source, because it does not supply a hash.", {"stone": stone, "cache": _gthis}]);
+				Log.log(20, ...["Generating source, because it does not supply a hash.", {"stone": stone, "cache": _gthis}]);
 			};
 			if (hash == null) {
 				return stone.generateSource(null).then(function (generatedSource) {
 					return {"generatedSource": generatedSource, "hash": generatedSource.hash};
 				});
 			} else {
+				Log.log(20, ...["Stone provided hash.", {"stone": stone, "hash": SourceHash.toHex(hash)}]);
 				return Promise.resolve({"generatedSource": null, "hash": hash});
 			};
 		}).then(function (data) {
@@ -66,7 +63,7 @@ class BaseCache extends Register.inherits() {
 					_gthis.setRecentUseOrder(values, value);
 				};
 			};
-			var srcPromise = ((value != null) ? _gthis.source(stone, value) : Promise.resolve(null)).then(function (src) {
+			return ((value != null) ? _gthis.source(stone, value) : Promise.resolve(null)).then(function (src) {
 				if (src == null) {
 					Log.log(10, ...["Not cached.", {"stone": stone, "cache": _gthis}]);
 					return ((value != null) ? _gthis.remove(stone, value) : Promise.resolve(null)).then(function (_) {
@@ -87,19 +84,19 @@ class BaseCache extends Register.inherits() {
 					Log.log(10, ...["Found in cache", {"stone": stone, "cache": _gthis}]);
 					return Promise.resolve(src);
 				};
-			});
-			srcPromise.then(function (_) {
+			}).then(function (src) {
 				if ((check == null) ? true : check._hx_index == 0) {
 					_gthis.checkDurability(stone, values, durability, function (v) {
 						return values.indexOf(v);
 					}, ageCount);
 				};
+				return src;
 			});
-			return srcPromise;
 		});
 	}
 	set(source) {
 		var _gthis = this;
+		Log.log(10, ...["Setting source in cache.", {"source": source}]);
 		var k = this.key(source.origin);
 		if (!this.cache.exists(k)) {
 			this.cache.set(k, []);
@@ -127,21 +124,26 @@ class BaseCache extends Register.inherits() {
 		};
 		var filenames = this.getExistingDirs(stone);
 		var maxNum = (filenames != null) ? Lambda.fold(filenames, function (fn, num) {
-			var s = Path.addTrailingSlash(Path.directory(fn));
-			var norm = "/" + Path.normalize((s.charAt(0) == "/") ? HxOverrides.substr(s, 1, null) : s);
-			var this1 = (s.lastIndexOf("/") == s.length - 1) ? Path.addTrailingSlash(norm) : norm;
+			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 root = _gthis.rootDir;
-			var parts = ((root.length == 1) ? this1.substring(1) : root.substring(1, root.length - 1) + this1).split("/");
+			if (this1.charAt(0) != "/") {
+				throw new Error("Badly formed SourceId.");
+			};
+			var parts = Path.posix.join(".", root, ".", this1).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 norm = "/" + Path.normalize((s.charAt(0) == "/") ? HxOverrides.substr(s, 1, null) : s);
-		return SourceId.getPutInDir((s.lastIndexOf("/") == s.length - 1) ? Path.addTrailingSlash(norm) : norm, baseDir);
+		s = Path.posix.normalize(s);
+		s = StringTools.replace(s, "\\", "/");
+		return SourceId.getPutInDir((SourceId_Fields_.startsWithSlash(s)) ? s : "/" + s, baseDir);
 	}
 	checkDurability(stone, values, durability, useIndex, ageIndex) {
-		Log.log(10, ...["Checking durability.", {"stone": stone, "durability": Std.string(durability)}]);
+		Log.log(20, ...["Checking durability.", {"stone": stone, "durability": Std.string(durability)}]);
 		if (values == null || values.length == 0) {
 			return;
 		};
@@ -190,6 +192,7 @@ class BaseCache extends Register.inherits() {
 		return true;
 	}
 	remove(stone, value) {
+		Log.log(20, ...["Removing cached value.", {"stone": stone, "valueHash": SourceHash.toHex(value.hash)}]);
 		HxOverrides.remove(this.cache.get(this.key(stone)), value);
 		return Promise.resolve(null);
 	}

package/bin/whet/cache/CacheManager.d.ts

@@ -12,6 +12,11 @@ export declare class CacheManager {
 	defaultStrategy: CacheStrategy
 	protected memCache: MemoryCache
 	protected fileCache: FileCache
+	
+	/**
+	Keep last used 5 for a day and last used 1 indefinitely.
+	*/
+	defaultFileStrategy: CacheStrategy
 	getSource(stone: AnyStone): Promise<Source>
 	
 	/**