whet 0.0.11 → 0.0.14

package/bin/whet/Source.js

@@ -1,8 +1,9 @@
 import {Utils} from "./Utils.js"
 import {SourceId, RootDir} from "./SourceId.js"
 import {SourceHash} from "./SourceHash.js"
-import {Log} from "./Log.js"
+import {Log as Log__1} from "./Log.js"
 import * as Path from "path"
+import {Log} from "../haxe/Log.js"
 import {Register} from "../genes/Register.js"
 import * as Fs from "fs"
 import {Buffer} from "buffer"
@@ -82,6 +83,7 @@ class SourceData extends Register.inherits() {
 	*/
 	getFilePathId(idOverride) {
 		var _gthis = this;
+		Log.trace(this.filePath, {"fileName": "src/whet/Source.hx", "lineNumber": 106, "className": "whet.SourceData", "methodName": "getFilePathId", "customParams": [this.filePathId, idOverride]});
 		if (this.filePathId == null) {
 			return this.getFilePath(idOverride).then(function (_) {
 				return _gthis.filePathId;
@@ -101,13 +103,14 @@ class SourceData extends Register.inherits() {
 				new Error("Data without source.");
 			};
 			var dir = this.source.getDirPath();
-			this.filePathId = SourceId.getPutInDir((idOverride != null) ? idOverride : this.id, dir);
+			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.");
 			};
 			this.filePath = Path.posix.join(".", root, ".", this1);
+			Log.trace(dir, {"fileName": "src/whet/Source.hx", "lineNumber": 121, "className": "whet.SourceData", "methodName": "getFilePath", "customParams": [this.filePath, this.filePathId]});
 			return Utils.saveBytes(this.filePath, this.data).then(function (_) {
 				return _gthis.filePath;
 			});
@@ -126,7 +129,7 @@ class SourceData extends Register.inherits() {
 		return new Promise(function (res, rej) {
 			Fs.readFile(path, function (err, buffer) {
 				if (err != null) {
-					Log.log(50, ...["File does not exist.", {"id": id, "path": path}]);
+					Log__1.log(50, ...["File does not exist.", {"id": id, "path": path}]);
 					res(null);
 				} else {
 					var source = SourceData.fromBytes(id, buffer);

package/bin/whet/Stone.d.ts

@@ -42,18 +42,41 @@ export declare class Stone<T extends StoneConfig> {
 	*/
 	getHash(): Promise<SourceHash>
 	
+	/**
+	* **Do not override.**
+	* Should only be used internally.
+	* Used to finalize a hash in `getHash` or in `generateSource` if `getHash` isn't implemented.
+	* Also used by the cache for the same purpose.
+	*/
+	protected finalizeHash(hash: SourceHash): Promise<null | 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.
 	*/
-	protected generateSource(hash: SourceHash): Promise<Source>
+	protected generateSource(hash: null | SourceHash): Promise<Source>
+	
+	/**
+	* To be used externally (i.e. `myStone.handleError = err => ...`) for providing a fallback value
+	* where it might make sense.
+	* @param err Any error that might have happened during `generateSource`.
+	*/
+	handleError(err: any): Promise<SourceData[]>
 	
 	/**
 	* Optionally overridable hash generation as optimization.
+	* Do not use directly. Use `getHash` instead.
 	*/
 	protected generateHash(): Promise<SourceHash>
 	
+	/**
+	* **Do not override.**
+	* Used by cache. Returns either null, or result of `generateHash` finalized by adding
+	* dependencies.
+	*/
+	protected finalMaybeHash(): Promise<null | SourceHash>
+	
 	/**
 	* Abstract method.
 	* Function that actually generates the source. Passed hash is only non-null
@@ -97,12 +120,17 @@ export declare class Stone<T extends StoneConfig> {
 }
 
 export type StoneConfig = {
+	/**
+	* Defaults to `project.cache.defaultStrategy`.
+	* **Do not modify after initialization – it is ignored.**
+	* After stone is initialized, change `stone.cacheStrategy` directly.
+	*/
 	cacheStrategy?: null | CacheStrategy, 
 	/**
-	* Registers another stone as dependency of this one. Useful for external processes
+	* Registers another stone(s) as dependency of this one. Useful for external processes
 	* that use a source of some stone, but don't go via Whet to get it.
 	* Use with combination of `setAbsolutePath` on the dependency, so that the external process
-	* can rely on fixed path.
+	* can rely on a fixed path.
 	* Will make sure the cached file is up to date when generating this stone.
 	* Hash of the dependency is automatically combined with hash generated by this stone. There's no
 	* need to add it manually.

package/bin/whet/Stone.js

@@ -66,27 +66,37 @@ class Stone extends Register.inherits() {
 	getHash() {
 		var _gthis = this;
 		Log.log(20, ...["Generating hash.", {"stone": this}]);
-		return this.generateHash().then(function (hash) {
+		return this.finalMaybeHash().then(function (hash) {
 			if (hash != null) {
 				return hash;
 			} else {
 				return _gthis.getSource().then(function (s) {
-					if (_gthis.config.dependencies != null) {
-						var _g = [];
-						var _g1 = 0;
-						var _g2 = MaybeArray_Fields_.makeArray(_gthis.config.dependencies);
-						while (_g1 < _g2.length) _g.push(_g2[_g1++].getHash());
-						return Promise.all(_g).then(function (hashes) {
-							return s.hash.add(SourceHash.merge(...hashes));
-						});
-					} else {
-						return Promise.resolve(s.hash);
-					};
+					return s.hash;
 				});
 			};
 		});
 	}
 	
+	/**
+	* **Do not override.**
+	* Should only be used internally.
+	* Used to finalize a hash in `getHash` or in `generateSource` if `getHash` isn't implemented.
+	* Also used by the cache for the same purpose.
+	*/
+	finalizeHash(hash) {
+		if (hash == null || this.config.dependencies == null) {
+			return Promise.resolve(hash);
+		} else {
+			var _g = [];
+			var _g1 = 0;
+			var _g2 = MaybeArray_Fields_.makeArray(this.config.dependencies);
+			while (_g1 < _g2.length) _g.push(_g2[_g1++].getHash());
+			return Promise.all(_g).then(function (hashes) {
+				return hash.add(SourceHash.merge(...hashes));
+			});
+		};
+	}
+	
 	/**
 	* **Do not override.**
 	* Generates new Source. Used by the cache when needed.
@@ -95,7 +105,6 @@ class Stone extends Register.inherits() {
 	generateSource(hash) {
 		var _gthis = this;
 		Log.log(20, ...["Generating source.", {"stone": this, "hash": hash}]);
-		console.log("src/whet/Stone.hx:74:",this.config.dependencies);
 		var init;
 		if (this.config.dependencies != null) {
 			var _g = [];
@@ -110,7 +119,11 @@ class Stone extends Register.inherits() {
 			var dataPromise = _gthis.generate(hash);
 			if (dataPromise != null) {
 				return dataPromise.then(function (data) {
-					if (hash == null) {
+					var finalHash;
+					if (hash != null) {
+						finalHash = Promise.resolve(hash);
+					} else {
+						var _gthis1 = _gthis;
 						var result = new Array(data.length);
 						var _g = 0;
 						var _g1 = data.length;
@@ -118,23 +131,59 @@ class Stone extends Register.inherits() {
 							var i = _g++;
 							result[i] = SourceHash.fromBytes(data[i].data);
 						};
-						hash = SourceHash.merge(...result);
+						finalHash = _gthis1.finalizeHash(SourceHash.merge(...result));
 					};
-					return new Source(data, hash, _gthis, Date.now() / 1000);
+					return finalHash.then(function (hash) {
+						return new Source(data, hash, _gthis, Date.now() / 1000);
+					});
 				});
 			} else {
 				return null;
 			};
+		})["catch"](function (e) {
+			return _gthis.handleError(e).then(function (data) {
+				Log.log(40, ...["Error happened and was handled by `handleError`.", {"stone": _gthis, "error": e}]);
+				var result = new Array(data.length);
+				var _g = 0;
+				var _g1 = data.length;
+				while (_g < _g1) {
+					var i = _g++;
+					result[i] = SourceHash.fromBytes(data[i].data);
+				};
+				return new Source(data, SourceHash.merge(...result), _gthis, Date.now() / 1000);
+			});
 		});
 	}
 	
+	/**
+	* To be used externally (i.e. `myStone.handleError = err => ...`) for providing a fallback value
+	* where it might make sense.
+	* @param err Any error that might have happened during `generateSource`.
+	*/
+	handleError(err) {
+		return Promise.reject(err);
+	}
+	
 	/**
 	* Optionally overridable hash generation as optimization.
+	* Do not use directly. Use `getHash` instead.
 	*/
 	generateHash() {
 		return Promise.resolve(null);
 	}
 	
+	/**
+	* **Do not override.**
+	* Used by cache. Returns either null, or result of `generateHash` finalized by adding
+	* dependencies.
+	*/
+	finalMaybeHash() {
+		var _gthis = this;
+		return this.generateHash().then(function (hash) {
+			return _gthis.finalizeHash(hash);
+		});
+	}
+	
 	/**
 	* Returns a list of sources that this stone generates.
 	* Used by Router for finding the correct asset.

package/bin/whet/Utils.js

@@ -53,7 +53,7 @@ class Utils {
 	Saves bytes Buffer, creates missing directories if needed.
 	*/
 	static saveBytes(path, bytes) {
-		Log.log(10, ...["Writing bytes to " + path + "."]);
+		Log.log(10, ...["Writing bytes to \"" + path + "\"."]);
 		return Utils.ensureDirExist(Path.dirname(path)).then(function (_) {
 			return new Promise(function (res, rej) {
 				Fs.writeFile(path, bytes, function (err) {

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.11", "-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.14", "-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

@@ -23,7 +23,7 @@ class BaseCache extends Register.inherits() {
 	}
 	get(stone, durability, check) {
 		var _gthis = this;
-		return stone.generateHash().then(function (hash) {
+		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}]);
 			};

package/bin/whet/cache/CacheManager.js

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

package/bin/whet/cache/FileCache.js

@@ -94,6 +94,7 @@ class FileCache extends Register.inherits(BaseCache) {
 		if (_g._hx_index == 3) {
 			var _g1 = _g.path;
 			if (source.data.length == 1) {
+				console.log("src/whet/cache/FileCache.hx:46:",_g1);
 				var s = _g1.substring(_g1.lastIndexOf("/"));
 				var str = (s.length > 1 && HxOverrides.cca(s, 0) == 47) ? s.substring(1) : s;
 				if (str.length > 0) {
@@ -108,6 +109,7 @@ class FileCache extends Register.inherits(BaseCache) {
 		} else {
 			idOverride = null;
 		};
+		console.log("src/whet/cache/FileCache.hx:50:",idOverride);
 		var _g = [];
 		var _g1 = 0;
 		var _g2 = source.data;
@@ -116,7 +118,9 @@ class FileCache extends Register.inherits(BaseCache) {
 			++_g1;
 			_g.push(data[0].getFilePathId(idOverride).then((function (data) {
 				return function (filePath) {
-					return {"fileHash": SourceHash.fromBytes(data[0].data), "filePath": filePath, "id": data[0].id};
+					var tmp = SourceHash.fromBytes(data[0].data);
+					console.log("src/whet/cache/FileCache.hx:53:",filePath);
+					return {"fileHash": tmp, "filePath": filePath, "id": data[0].id};
 				};
 			})(data)));
 		};

package/bin/whet/route/RouteResult.js

@@ -1,3 +1,4 @@
+import {Log} from "../../haxe/Log.js"
 import {Register} from "../../genes/Register.js"
 
 const $global = Register.$global
@@ -12,6 +13,16 @@ class RouteResult extends Register.inherits() {
 	get() {
 		var _gthis = this;
 		return this.source.getSource().then(function (data) {
+			Log.trace("getting ", {"fileName": "src/whet/route/RouteResult.hx", "lineNumber": 17, "className": "whet.route.RouteResult", "methodName": "get", "customParams": [_gthis.sourceId, "has data:"]});
+			var _this = data.data;
+			var result = new Array(_this.length);
+			var _g = 0;
+			var _g1 = _this.length;
+			while (_g < _g1) {
+				var i = _g++;
+				result[i] = _this[i].id;
+			};
+			console.log("src/whet/route/RouteResult.hx:18:",result);
 			return data.get(_gthis.sourceId);
 		});
 	}

package/bin/whet/stones/Files.d.ts

@@ -13,12 +13,17 @@ export declare class Files extends Stone<FilesConfig> {
 }
 
 export type FilesConfig = {
+	/**
+	* Defaults to `project.cache.defaultStrategy`.
+	* **Do not modify after initialization – it is ignored.**
+	* After stone is initialized, change `stone.cacheStrategy` directly.
+	*/
 	cacheStrategy?: null | CacheStrategy, 
 	/**
-	* Registers another stone as dependency of this one. Useful for external processes
+	* Registers another stone(s) as dependency of this one. Useful for external processes
 	* that use a source of some stone, but don't go via Whet to get it.
 	* Use with combination of `setAbsolutePath` on the dependency, so that the external process
-	* can rely on fixed path.
+	* can rely on a fixed path.
 	* Will make sure the cached file is up to date when generating this stone.
 	* Hash of the dependency is automatically combined with hash generated by this stone. There's no
 	* need to add it manually.

package/bin/whet/stones/JsonStone.d.ts

@@ -19,12 +19,17 @@ export declare class JsonStone extends Stone<JsonStoneConfig> {
 }
 
 export type JsonStoneConfig = {
+	/**
+	* Defaults to `project.cache.defaultStrategy`.
+	* **Do not modify after initialization – it is ignored.**
+	* After stone is initialized, change `stone.cacheStrategy` directly.
+	*/
 	cacheStrategy?: null | CacheStrategy, 
 	/**
-	* Registers another stone as dependency of this one. Useful for external processes
+	* Registers another stone(s) as dependency of this one. Useful for external processes
 	* that use a source of some stone, but don't go via Whet to get it.
 	* Use with combination of `setAbsolutePath` on the dependency, so that the external process
-	* can rely on fixed path.
+	* can rely on a fixed path.
 	* Will make sure the cached file is up to date when generating this stone.
 	* Hash of the dependency is automatically combined with hash generated by this stone. There's no
 	* need to add it manually.

package/bin/whet/stones/RemoteFile.d.ts

@@ -16,12 +16,17 @@ export declare class RemoteFile extends Stone<RemoteFileConfig> {
 }
 
 export type RemoteFileConfig = {
+	/**
+	* Defaults to `project.cache.defaultStrategy`.
+	* **Do not modify after initialization – it is ignored.**
+	* After stone is initialized, change `stone.cacheStrategy` directly.
+	*/
 	cacheStrategy?: null | CacheStrategy, 
 	/**
-	* Registers another stone as dependency of this one. Useful for external processes
+	* Registers another stone(s) as dependency of this one. Useful for external processes
 	* that use a source of some stone, but don't go via Whet to get it.
 	* Use with combination of `setAbsolutePath` on the dependency, so that the external process
-	* can rely on fixed path.
+	* can rely on a fixed path.
 	* Will make sure the cached file is up to date when generating this stone.
 	* Hash of the dependency is automatically combined with hash generated by this stone. There's no
 	* need to add it manually.

package/bin/whet/stones/Server.d.ts

@@ -25,12 +25,17 @@ export declare class Server extends Stone<ServerConfig> {
 }
 
 export type ServerConfig = {
+	/**
+	* Defaults to `project.cache.defaultStrategy`.
+	* **Do not modify after initialization – it is ignored.**
+	* After stone is initialized, change `stone.cacheStrategy` directly.
+	*/
 	cacheStrategy?: null | CacheStrategy, 
 	/**
-	* Registers another stone as dependency of this one. Useful for external processes
+	* Registers another stone(s) as dependency of this one. Useful for external processes
 	* that use a source of some stone, but don't go via Whet to get it.
 	* Use with combination of `setAbsolutePath` on the dependency, so that the external process
-	* can rely on fixed path.
+	* can rely on a fixed path.
 	* Will make sure the cached file is up to date when generating this stone.
 	* Hash of the dependency is automatically combined with hash generated by this stone. There's no
 	* need to add it manually.

package/bin/whet/stones/Server.js

@@ -1,8 +1,9 @@
 import {Stone} from "../Stone.js"
-import {Log} from "../Log.js"
+import {Log, Log as Log__2} from "../Log.js"
 import * as Path from "path"
 import Mime from "mime"
 import * as Http from "http"
+import {Log as Log__1} from "../../haxe/Log.js"
 import {Register} from "../../genes/Register.js"
 import {StringTools} from "../../StringTools.js"
 import {Std} from "../../Std.js"
@@ -98,7 +99,11 @@ class Server extends Register.inherits(Stone) {
 				id = (HxOverrides.cca(s, 0) == 47) ? s : "/" + s;
 			};
 			this.config.router.find(id).then(function (routeResult) {
+				Log__1.trace("result for ", {"fileName": "src/whet/stones/Server.hx", "lineNumber": 60, "className": "whet.stones.Server", "methodName": "handler", "customParams": [id]});
+				console.log("src/whet/stones/Server.hx:61:",routeResult);
 				return ((routeResult.length > 0) ? routeResult[0].get() : (_gthis.routeDynamic != null) ? _gthis.routeDynamic(id) : Promise.resolve(null)).then(function (source) {
+					Log__1.trace("Source for ", {"fileName": "src/whet/stones/Server.hx", "lineNumber": 66, "className": "whet.stones.Server", "methodName": "handler", "customParams": [id]});
+					console.log("src/whet/stones/Server.hx:67:",source);
 					if (source == null) {
 						res.writeHead(404, "File not found.");
 						res.end();

package/bin/whet/stones/Zip.d.ts

@@ -16,12 +16,17 @@ export declare class ZipStone extends Stone<ZipConfig> {
 }
 
 export type ZipConfig = {
+	/**
+	* Defaults to `project.cache.defaultStrategy`.
+	* **Do not modify after initialization – it is ignored.**
+	* After stone is initialized, change `stone.cacheStrategy` directly.
+	*/
 	cacheStrategy?: null | CacheStrategy, 
 	/**
-	* Registers another stone as dependency of this one. Useful for external processes
+	* Registers another stone(s) as dependency of this one. Useful for external processes
 	* that use a source of some stone, but don't go via Whet to get it.
 	* Use with combination of `setAbsolutePath` on the dependency, so that the external process
-	* can rely on fixed path.
+	* can rely on a fixed path.
 	* Will make sure the cached file is up to date when generating this stone.
 	* Hash of the dependency is automatically combined with hash generated by this stone. There's no
 	* need to add it manually.

package/bin/whet/stones/haxe/HaxeBuild.d.ts

@@ -22,12 +22,17 @@ export declare class HaxeBuild extends Stone<BuildConfig> {
 }
 
 export type BuildConfig = {
+	/**
+	* Defaults to `project.cache.defaultStrategy`.
+	* **Do not modify after initialization – it is ignored.**
+	* After stone is initialized, change `stone.cacheStrategy` directly.
+	*/
 	cacheStrategy?: null | CacheStrategy, 
 	/**
-	* Registers another stone as dependency of this one. Useful for external processes
+	* Registers another stone(s) as dependency of this one. Useful for external processes
 	* that use a source of some stone, but don't go via Whet to get it.
 	* Use with combination of `setAbsolutePath` on the dependency, so that the external process
-	* can rely on fixed path.
+	* can rely on a fixed path.
 	* Will make sure the cached file is up to date when generating this stone.
 	* Hash of the dependency is automatically combined with hash generated by this stone. There's no
 	* need to add it manually.

package/bin/whet/stones/haxe/HaxeBuild.js

@@ -61,8 +61,9 @@ class HaxeBuild extends Register.inherits(Stone) {
 			};
 			ChildProcess.exec(result.join(" "), {"cwd": cwd1, "windowsHide": true}, function (err, stdout, stderr) {
 				if (err != null) {
-					Log.log(30, ...["Haxe build failed."]);
-					rej(err);
+					var haxeError = new Error(stderr);
+					haxeError.name = "Haxe Build Error";
+					rej(haxeError);
 				} else {
 					Log.log(30, ...["Haxe build successful."]);
 					res(null);
@@ -124,7 +125,7 @@ class HaxeBuild extends Register.inherits(Stone) {
 			};
 			result[i] = Path.posix.join(".", root, ".", this1);
 		};
-		return Promise.all([this.config.hxml.generateHash(), SourceHash.fromFiles(result)]).then(function (r) {
+		return Promise.all([this.config.hxml.getHash(), SourceHash.fromFiles(result)]).then(function (r) {
 			return SourceHash.merge(...r);
 		});
 	}

package/bin/whet/stones/haxe/Hxml.d.ts

@@ -30,15 +30,20 @@ export declare class Hxml extends Stone<HxmlConfig> {
 }
 
 export type HxmlConfig = {
+	/**
+	* Defaults to `project.cache.defaultStrategy`.
+	* **Do not modify after initialization – it is ignored.**
+	* After stone is initialized, change `stone.cacheStrategy` directly.
+	*/
 	cacheStrategy?: null | CacheStrategy, 
 	dce?: null | DCE, 
 	debug?: null | boolean, 
 	defines?: null | MaybeArray<string>, 
 	/**
-	* Registers another stone as dependency of this one. Useful for external processes
+	* Registers another stone(s) as dependency of this one. Useful for external processes
 	* that use a source of some stone, but don't go via Whet to get it.
 	* Use with combination of `setAbsolutePath` on the dependency, so that the external process
-	* can rely on fixed path.
+	* can rely on a fixed path.
 	* Will make sure the cached file is up to date when generating this stone.
 	* Hash of the dependency is automatically combined with hash generated by this stone. There's no
 	* need to add it manually.

package/package.json

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