whet 0.0.12 → 0.0.13

package/bin/whet/Stone.d.ts

@@ -42,18 +42,34 @@ 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>
 	
 	/**
 	* 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

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.
@@ -109,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;
@@ -117,9 +131,11 @@ 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;
@@ -129,11 +145,24 @@ class Stone extends Register.inherits() {
 	
 	/**
 	* 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/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.12", "-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.13", "-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/stones/haxe/HaxeBuild.js

@@ -124,7 +124,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/package.json

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