whet 0.0.18 → 0.0.19

package/bin/haxe/Exception.d.ts

@@ -62,5 +62,6 @@ export declare class Exception extends Error {
 	toString(): string
 	protected get_message(): string
 	protected get_native(): any
+	protected static caught(value: any): Exception
 	protected static thrown(value: any): any
 }

package/bin/haxe/Exception.js

@@ -65,6 +65,15 @@ class Exception extends Register.inherits(() => Error, true) {
 	get_native() {
 		return this.__nativeException;
 	}
+	static caught(value) {
+		if (((value) instanceof Exception)) {
+			return value;
+		} else if (((value) instanceof Error)) {
+			return new Exception(value.message, null, value);
+		} else {
+			return new ValueException(value, null, value);
+		};
+	}
 	static thrown(value) {
 		if (((value) instanceof Exception)) {
 			return value.get_native();

package/bin/whet/Source.js

@@ -129,7 +129,7 @@ class SourceData extends Register.inherits() {
 			Fs.readFile(path, function (err, buffer) {
 				if (err != null) {
 					Log.log(50, ...["File does not exist.", {"id": id, "path": path}]);
-					res(null);
+					rej(err);
 				} else {
 					var source = SourceData.fromBytes(id, buffer);
 					source.filePath = path;

package/bin/whet/Stone.d.ts

@@ -18,6 +18,12 @@ export declare class Stone<T extends StoneConfig> {
 	cacheStrategy: CacheStrategy
 	readonly cache: CacheManager
 	project: Project
+	protected lockQueue: {
+		rej: (arg0: any) => void, 
+		res: (arg0: any) => void, 
+		run: () => Promise<any>
+	}[]
+	protected locked: boolean
 	
 	/**
 	Override this to set config defaults.
@@ -29,6 +35,11 @@ export declare class Stone<T extends StoneConfig> {
 	*/
 	protected addCommands(): void
 	
+	/**
+	* Locks this stone for generating. Used to prevent parallel generation of the same sources.
+	*/
+	protected acquire<T>(run: (() => Promise<T>)): Promise<T>
+	
 	/**
 	* **Do not override.**
 	* Get Source for this stone. Goes through the cache.

package/bin/whet/Stone.js

@@ -17,6 +17,8 @@ const $global = Register.$global
 export const Stone = Register.global("$hxClasses")["whet.Stone"] = 
 class Stone extends Register.inherits() {
 	new(config) {
+		this.locked = false;
+		this.lockQueue = [];
 		this.ignoreFileHash = false;
 		Log.log(10, ...["Instantiating new Stone.", {"type": StoneId_Fields_.getTypeName(this)}]);
 		if (config == null) {
@@ -49,6 +51,39 @@ class Stone extends Register.inherits() {
 	addCommands() {
 	}
 	
+	/**
+	* Locks this stone for generating. Used to prevent parallel generation of the same sources.
+	*/
+	acquire(run) {
+		var _gthis = this;
+		Log.log(10, ...["Acquiring lock on a stone.", {"stone": this}]);
+		if (this.locked) {
+			Log.log(20, ...["Stone is locked, waiting.", {"stone": this}]);
+			var deferredRes;
+			var deferredRej;
+			var deferred = new Promise(function (res, rej) {
+				deferredRes = res;
+				deferredRej = rej;
+			});
+			this.lockQueue.push({"run": run, "res": deferredRes, "rej": deferredRej});
+			return deferred;
+		} else {
+			this.locked = true;
+			var runNext = null;
+			runNext = function () {
+				if (_gthis.lockQueue.length > 0) {
+					Log.log(20, ...["Running next queued-up lock acquire function.", {"stone": _gthis}]);
+					var queued = _gthis.lockQueue.shift();
+					queued.run().then(queued.res)["catch"](queued.rej)["finally"](runNext);
+				} else {
+					_gthis.locked = false;
+					Log.log(10, ...["No function in lock queue. Stone is now unlocked.", {"stone": _gthis}]);
+				};
+			};
+			return run()["finally"](runNext);
+		};
+	}
+	
 	/**
 	* **Do not override.**
 	* Get Source for this stone. Goes through the cache.
@@ -104,6 +139,9 @@ class Stone extends Register.inherits() {
 	*/
 	generateSource(hash) {
 		var _gthis = this;
+		if (!this.locked) {
+			throw new Error("Acquire a lock before generating.");
+		};
 		Log.log(20, ...["Generating source.", {"stone": this, "hash": hash}]);
 		var init;
 		if (this.config.dependencies != null) {

package/bin/whet/Whet.js

@@ -2,6 +2,7 @@ import {Project} from "./Project.js"
 import {LogLevel, Log} from "./Log.js"
 import * as Url from "url"
 import * as PinoPretty from "pino-pretty"
+import {Exception} from "../haxe/Exception.js"
 import {Register} from "../genes/Register.js"
 import {Command, CommanderError} from "commander"
 import {Std} from "../Std.js"
@@ -11,8 +12,17 @@ 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.18", "-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.parse();
+		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();
+		try {
+			Whet_Fields_.program.parse();
+		}catch (_g) {
+			var _g1 = Exception.caught(_g);
+			if (((_g1.get_native()) instanceof CommanderError) && _g1.get_native().code == "commander.version") {
+				process.exit();
+			} else {
+				throw Exception.thrown(_g1);
+			};
+		};
 		var options = Whet_Fields_.program.opts();
 		if (options.logLevel != null) {
 			var n = Std.parseInt(options.logLevel);

package/bin/whet/cache/BaseCache.js

@@ -23,74 +23,76 @@ class BaseCache extends Register.inherits() {
 	}
 	get(stone, durability, check) {
 		var _gthis = this;
-		return stone.finalMaybeHash().then(function (hash) {
-			if (hash == null) {
-				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) {
-			var generatedSource = data.generatedSource;
-			var hash = data.hash;
-			var values = _gthis.cache.get(_gthis.key(stone));
-			var ageCount = function (val) {
-				return Lambda.count(values, function (v) {
-					if (v != val) {
-						return v.ctime > val.ctime;
-					} else {
-						return false;
-					};
-				});
-			};
-			var value = null;
-			if (values != null && values.length > 0) {
-				value = Lambda.find(values, function (v) {
-					return SourceHash.equals(v.hash, hash);
-				});
-				if (value != null && check._hx_index == 2 && !_gthis.shouldKeep(stone, value, durability, function (v) {
-					return 0;
-				}, ageCount)) {
-					_gthis.remove(stone, value);
-					value = null;
+		return stone.acquire(function () {
+			return stone.finalMaybeHash().then(function (hash) {
+				if (hash == null) {
+					Log.log(20, ...["Generating source, because it does not supply a hash.", {"stone": stone, "cache": _gthis}]);
 				};
-				if (value != null) {
-					_gthis.setRecentUseOrder(values, value);
+				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});
 				};
-			};
-			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 (_) {
-						if (check._hx_index == 1) {
-							_gthis.checkDurability(stone, values, durability, function (v) {
-								return values.indexOf(v) + 1;
-							}, function (v) {
-								return ageCount(v) + 1;
-							});
+			}).then(function (data) {
+				var generatedSource = data.generatedSource;
+				var hash = data.hash;
+				var values = _gthis.cache.get(_gthis.key(stone));
+				var ageCount = function (val) {
+					return Lambda.count(values, function (v) {
+						if (v != val) {
+							return v.ctime > val.ctime;
+						} else {
+							return false;
 						};
-						return ((generatedSource != null) ? Promise.resolve(generatedSource) : stone.generateSource(hash)).then(function (src) {
-							return _gthis.set(src);
-						}).then(function (val) {
-							return _gthis.source(stone, val);
-						});
 					});
-				} else {
-					Log.log(10, ...["Found in cache", {"stone": stone, "cache": _gthis}]);
-					return Promise.resolve(src);
 				};
-			}).then(function (src) {
-				if ((check == null) ? true : check._hx_index == 0) {
-					_gthis.checkDurability(stone, values, durability, function (v) {
-						return values.indexOf(v);
-					}, ageCount);
+				var value = null;
+				if (values != null && values.length > 0) {
+					value = Lambda.find(values, function (v) {
+						return SourceHash.equals(v.hash, hash);
+					});
+					if (value != null && check._hx_index == 2 && !_gthis.shouldKeep(stone, value, durability, function (v) {
+						return 0;
+					}, ageCount)) {
+						_gthis.remove(stone, value);
+						value = null;
+					};
+					if (value != null) {
+						_gthis.setRecentUseOrder(values, value);
+					};
 				};
-				return 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 (_) {
+							if (check._hx_index == 1) {
+								_gthis.checkDurability(stone, values, durability, function (v) {
+									return values.indexOf(v) + 1;
+								}, function (v) {
+									return ageCount(v) + 1;
+								});
+							};
+							return ((generatedSource != null) ? Promise.resolve(generatedSource) : stone.generateSource(hash)).then(function (src) {
+								return _gthis.set(src);
+							}).then(function (val) {
+								return _gthis.source(stone, val);
+							});
+						});
+					} else {
+						Log.log(10, ...["Found in cache", {"stone": stone, "cache": _gthis}]);
+						return Promise.resolve(src);
+					};
+				}).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;
+				});
 			});
 		});
 	}

package/bin/whet/cache/CacheManager.js

@@ -27,8 +27,10 @@ class CacheManager extends Register.inherits() {
 		var _g = stone.cacheStrategy;
 		switch (_g._hx_index) {
 			case 0:
-				return stone.finalMaybeHash().then(function (hash) {
-					return stone.generateSource(hash);
+				return stone.acquire(function () {
+					return stone.finalMaybeHash().then(function (hash) {
+						return stone.generateSource(hash);
+					});
 				});
 				break
 			case 1:
@@ -54,8 +56,10 @@ class CacheManager extends Register.inherits() {
 		Log.log(10, ...["Re-generating cached stone.", {"stone": stone}]);
 		switch (stone.cacheStrategy._hx_index) {
 			case 0:
-				return stone.finalMaybeHash().then(function (hash) {
-					return stone.generateSource(hash);
+				return stone.acquire(function () {
+					return stone.finalMaybeHash().then(function (hash) {
+						return stone.generateSource(hash);
+					});
 				});
 				break
 			case 1:

package/bin/whet/cache/FileCache.js

@@ -161,18 +161,26 @@ class FileCache extends Register.inherits(BaseCache) {
 				SourceData.fromFile(file[0].id, path, file[0].filePath).then((function (file) {
 					return function (sourceData) {
 						if (sourceData == null || !stone.ignoreFileHash && !SourceHash.equals(sourceData.hash, file[0].fileHash)) {
-							rej("Wrong hash.");
+							rej("Invalid.");
 						} else {
 							res(sourceData);
 						};
 					};
-				})(file));
+				})(file), (function () {
+					return function (err) {
+						if (((err) instanceof Error) && err.code == "ENOENT") {
+							rej("Invalid.");
+						} else {
+							rej(err);
+						};
+					};
+				})());
 			};
 		})([_g2[_g1++]])));
 		return Promise.all(_g).then(function (data) {
 			return new Source(data, value.hash, stone, value.ctime);
 		}, function (rejected) {
-			if (rejected == "Wrong hash.") {
+			if (rejected == "Invalid.") {
 				return null;
 			} else {
 				throw rejected;

package/bin/whet/magic/MinimatchType.js

@@ -1,5 +1,8 @@
+import * as Path from "path"
 import Minimatch from "minimatch"
 import {Register} from "../../genes/Register.js"
+import {StringTools} from "../../StringTools.js"
+import {HxOverrides} from "../../HxOverrides.js"
 
 const $global = Register.$global
 
@@ -7,7 +10,14 @@ export const MinimatchType_Fields_ = Register.global("$hxClasses")["whet.magic._
 class MinimatchType_Fields_ {
 	static makeMinimatch(src) {
 		if (typeof(src) == "string") {
-			return new Minimatch.Minimatch(src, null);
+			var s = src;
+			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 new Minimatch.Minimatch((HxOverrides.cca(s, 0) == 47) ? s : "/" + s, null);
 		} else if (src instanceof Minimatch.Minimatch) {
 			return src;
 		} else {

package/bin/whet/stones/Server.js

@@ -57,26 +57,7 @@ class Server extends Register.inherits(Stone) {
 		var _gthis = this;
 		Log.log(30, ...["Handling request.", {"url": req.url, "method": req.method}]);
 		var searchIndex = req.url.indexOf("?");
-		var id;
-		if (searchIndex > 0) {
-			var s = req.url.substring(0, searchIndex);
-			var str = (s.length > 1 && HxOverrides.cca(s, 0) == 47) ? s.substring(1) : s;
-			if (str.length > 0) {
-				str = Path.posix.normalize(str);
-				str = StringTools.replace(str, "\\", "/");
-			};
-			s = str;
-			id = (HxOverrides.cca(s, 0) == 47) ? s : "/" + s;
-		} else {
-			var s = req.url;
-			var str = (s.length > 1 && HxOverrides.cca(s, 0) == 47) ? s.substring(1) : s;
-			if (str.length > 0) {
-				str = Path.posix.normalize(str);
-				str = StringTools.replace(str, "\\", "/");
-			};
-			s = str;
-			id = (HxOverrides.cca(s, 0) == 47) ? s : "/" + s;
-		};
+		var id = decodeURI((searchIndex > 0 ? req.url.substring(0,searchIndex) : req.url));
 		switch (req.method) {
 			case "GET":
 				if (HxOverrides.cca(id, id.length - 1) == 47) {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "whet",
-    "version": "0.0.18",
+    "version": "0.0.19",
     "description": "NodeJS based assets management and project tooling library.",
     "scripts": {
         "devinit": "npx dts2hx commander pino-pretty --modular --noLibWrap",