whet 0.0.10 → 0.0.13

package/bin/whet/Stone.d.ts

@@ -1,4 +1,5 @@
 import {StoneIdType} from "./magic/StoneId"
+import {MaybeArray} from "./magic/MaybeArray"
 import {CacheManager} from "./cache/CacheManager"
 import {CacheStrategy} from "./cache/Cache"
 import {SourceHash} from "./SourceHash"
@@ -35,22 +36,40 @@ export declare class Stone<T extends StoneConfig> {
 	getSource(): Promise<Source>
 	
 	/**
-	Hash of this stone with its current config. Defaults to hash of generated source.
+	* **Do not override.**
+	* Hash of this stone with its current config. Defaults to hash of generated source.
+	* Hashes of dependency stones (see `config.dependencies`) will be added to the hash.
 	*/
 	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
@@ -72,7 +91,8 @@ export declare class Stone<T extends StoneConfig> {
 	* @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.
-	* @param generate If true (default), the source is exported right away.
+	* @param generate If true (default), the source is exported right away. Will not re-save the file, if it already
+	* exists under the same path and hash.
 	*/
 	setAbsolutePath(path: string, generate?: boolean): Promise<Source>
 	
@@ -95,6 +115,17 @@ export declare class Stone<T extends StoneConfig> {
 export type StoneConfig = {
 	cacheStrategy?: null | CacheStrategy, 
 	/**
+	* 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 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.
+	* Do not create cyclic dependencies!
+	*/
+	dependencies?: null | MaybeArray<AnyStone>, 
+	/**
 	Defaults to the Stone's class name.
 	*/
 	id?: null | StoneIdType, 

package/bin/whet/Stone.js

@@ -1,4 +1,5 @@
 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"
@@ -58,12 +59,14 @@ class Stone extends Register.inherits() {
 	}
 	
 	/**
-	Hash of this stone with its current config. Defaults to hash of generated source.
+	* **Do not override.**
+	* Hash of this stone with its current config. Defaults to hash of generated source.
+	* Hashes of dependency stones (see `config.dependencies`) will be added to the hash.
 	*/
 	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 {
@@ -74,6 +77,26 @@ class Stone extends Register.inherits() {
 		});
 	}
 	
+	/**
+	* **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.
@@ -82,33 +105,64 @@ class Stone extends Register.inherits() {
 	generateSource(hash) {
 		var _gthis = this;
 		Log.log(20, ...["Generating source.", {"stone": this, "hash": hash}]);
-		var dataPromise = this.generate(hash);
-		if (dataPromise != null) {
-			return dataPromise.then(function (data) {
-				if (hash == null) {
-					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);
-					};
-					hash = SourceHash.merge(...result);
-				};
-				return new Source(data, hash, _gthis, Date.now() / 1000);
-			});
+		var init;
+		if (this.config.dependencies != null) {
+			var _g = [];
+			var _g1 = 0;
+			var _g2 = MaybeArray_Fields_.makeArray(this.config.dependencies);
+			while (_g1 < _g2.length) _g.push(_g2[_g1++].getSource());
+			init = Promise.all(_g);
 		} else {
-			return null;
+			init = Promise.resolve(null);
 		};
+		return init.then(function (_) {
+			var dataPromise = _gthis.generate(hash);
+			if (dataPromise != null) {
+				return dataPromise.then(function (data) {
+					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;
+						while (_g < _g1) {
+							var i = _g++;
+							result[i] = SourceHash.fromBytes(data[i].data);
+						};
+						finalHash = _gthis1.finalizeHash(SourceHash.merge(...result));
+					};
+					return finalHash.then(function (hash) {
+						return new Source(data, hash, _gthis, Date.now() / 1000);
+					});
+				});
+			} else {
+				return null;
+			};
+		});
 	}
 	
 	/**
 	* 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.
@@ -134,7 +188,8 @@ class Stone extends Register.inherits() {
 	* @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.
-	* @param generate If true (default), the source is exported right away.
+	* @param generate If true (default), the source is exported right away. Will not re-save the file, if it already
+	* exists under the same path and hash.
 	*/
 	setAbsolutePath(path, generate) {
 		if (generate == null) {

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.10", "-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.d.ts

@@ -19,6 +19,11 @@ export declare class CacheManager {
 	defaultFileStrategy: CacheStrategy
 	getSource(stone: AnyStone): Promise<Source>
 	
+	/**
+	* Re-generates source even if the currently cached value is valid.
+	*/
+	refreshSource(stone: AnyStone): Promise<Source>
+	
 	/**
 	* Get valid directory to generate files in. The path is unique per stone based on caching rules.
 	* If hash is supplied, and a path was already assigned, the same path is returned, assuring consistency.

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
@@ -47,6 +47,30 @@ class CacheManager extends Register.inherits() {
 		};
 	}
 	
+	/**
+	* Re-generates source even if the currently cached value is valid.
+	*/
+	refreshSource(stone) {
+		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);
+				});
+				break
+			case 1:
+				return this.memCache.get(stone, CacheDurability.MaxAge(-1), DurabilityCheck.SingleOnGet);
+				break
+			case 2:
+				return this.fileCache.get(stone, CacheDurability.MaxAge(-1), DurabilityCheck.SingleOnGet);
+				break
+			case 3:
+				return this.fileCache.get(stone, CacheDurability.MaxAge(-1), DurabilityCheck.SingleOnGet);
+				break
+			
+		};
+	}
+	
 	/**
 	* Get valid directory to generate files in. The path is unique per stone based on caching rules.
 	* If hash is supplied, and a path was already assigned, the same path is returned, assuring consistency.

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

@@ -1,7 +1,7 @@
 import {StoneIdType} from "../magic/StoneId"
 import {MaybeArray} from "../magic/MaybeArray"
 import {CacheStrategy} from "../cache/Cache"
-import {Stone} from "../Stone"
+import {Stone, AnyStone} from "../Stone"
 import {SourceHash} from "../SourceHash"
 import {SourceData} from "../Source"
 import {Project} from "../Project"
@@ -15,6 +15,17 @@ export declare class Files extends Stone<FilesConfig> {
 export type FilesConfig = {
 	cacheStrategy?: null | CacheStrategy, 
 	/**
+	* 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 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.
+	* Do not create cyclic dependencies!
+	*/
+	dependencies?: null | MaybeArray<AnyStone>, 
+	/**
 	Defaults to the Stone's class name.
 	*/
 	id?: null | StoneIdType, 

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

@@ -2,7 +2,7 @@ import {StoneIdType} from "../magic/StoneId"
 import {RouteType} from "../magic/RouteType"
 import {MaybeArray} from "../magic/MaybeArray"
 import {CacheStrategy} from "../cache/Cache"
-import {Stone} from "../Stone"
+import {Stone, AnyStone} from "../Stone"
 import {SourceHash} from "../SourceHash"
 import {SourceData} from "../Source"
 import {Project} from "../Project"
@@ -21,6 +21,17 @@ export declare class JsonStone extends Stone<JsonStoneConfig> {
 export type JsonStoneConfig = {
 	cacheStrategy?: null | CacheStrategy, 
 	/**
+	* 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 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.
+	* Do not create cyclic dependencies!
+	*/
+	dependencies?: null | MaybeArray<AnyStone>, 
+	/**
 	Defaults to the Stone's class name.
 	*/
 	id?: null | StoneIdType, 

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

@@ -1,6 +1,7 @@
 import {StoneIdType} from "../magic/StoneId"
+import {MaybeArray} from "../magic/MaybeArray"
 import {CacheStrategy} from "../cache/Cache"
-import {Stone} from "../Stone"
+import {Stone, AnyStone} from "../Stone"
 import {SourceHash} from "../SourceHash"
 import {SourceData} from "../Source"
 import {Project} from "../Project"
@@ -17,6 +18,17 @@ export declare class RemoteFile extends Stone<RemoteFileConfig> {
 export type RemoteFileConfig = {
 	cacheStrategy?: null | CacheStrategy, 
 	/**
+	* 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 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.
+	* Do not create cyclic dependencies!
+	*/
+	dependencies?: null | MaybeArray<AnyStone>, 
+	/**
 	Defaults to the Stone's class name.
 	*/
 	id?: null | StoneIdType, 

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

@@ -1,7 +1,8 @@
 import {Router} from "../route/Router"
 import {StoneIdType} from "../magic/StoneId"
+import {MaybeArray} from "../magic/MaybeArray"
 import {CacheStrategy} from "../cache/Cache"
-import {Stone} from "../Stone"
+import {Stone, AnyStone} from "../Stone"
 import {SourceHash} from "../SourceHash"
 import {SourceData} from "../Source"
 import {Project} from "../Project"
@@ -26,6 +27,17 @@ export declare class Server extends Stone<ServerConfig> {
 export type ServerConfig = {
 	cacheStrategy?: null | CacheStrategy, 
 	/**
+	* 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 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.
+	* Do not create cyclic dependencies!
+	*/
+	dependencies?: null | MaybeArray<AnyStone>, 
+	/**
 	Defaults to the Stone's class name.
 	*/
 	id?: null | StoneIdType, 

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

@@ -1,7 +1,8 @@
 import {StoneIdType} from "../magic/StoneId"
 import {RoutePathType} from "../magic/RoutePathType"
+import {MaybeArray} from "../magic/MaybeArray"
 import {CacheStrategy} from "../cache/Cache"
-import {Stone} from "../Stone"
+import {Stone, AnyStone} from "../Stone"
 import {SourceHash} from "../SourceHash"
 import {SourceData} from "../Source"
 import {Project} from "../Project"
@@ -16,6 +17,17 @@ export declare class ZipStone extends Stone<ZipConfig> {
 
 export type ZipConfig = {
 	cacheStrategy?: null | CacheStrategy, 
+	/**
+	* 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 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.
+	* Do not create cyclic dependencies!
+	*/
+	dependencies?: null | MaybeArray<AnyStone>, 
 	filename?: null | string, 
 	/**
 	Defaults to the Stone's class name.

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

@@ -1,7 +1,8 @@
 import {Hxml} from "./Hxml"
 import {StoneIdType} from "../../magic/StoneId"
+import {MaybeArray} from "../../magic/MaybeArray"
 import {CacheStrategy} from "../../cache/Cache"
-import {Stone} from "../../Stone"
+import {Stone, AnyStone} from "../../Stone"
 import {SourceHash} from "../../SourceHash"
 import {SourceData} from "../../Source"
 import {Project} from "../../Project"
@@ -22,6 +23,17 @@ export declare class HaxeBuild extends Stone<BuildConfig> {
 
 export type BuildConfig = {
 	cacheStrategy?: null | CacheStrategy, 
+	/**
+	* 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 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.
+	* Do not create cyclic dependencies!
+	*/
+	dependencies?: null | MaybeArray<AnyStone>, 
 	filename?: null | string, 
 	hxml: Hxml, 
 	/**

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

@@ -93,7 +93,7 @@ class HaxeBuild extends Register.inherits(Stone) {
 	addCommands() {
 		var _gthis = this;
 		this.project.addCommand("build", this).action(function (..._) {
-			return _gthis.build();
+			return _gthis.project.cache.refreshSource(_gthis);
 		});
 	}
 	list() {
@@ -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/bin/whet/stones/haxe/Hxml.d.ts

@@ -2,7 +2,7 @@ import {HaxeBuild} from "./HaxeBuild"
 import {StoneIdType} from "../../magic/StoneId"
 import {MaybeArray} from "../../magic/MaybeArray"
 import {CacheStrategy} from "../../cache/Cache"
-import {Stone} from "../../Stone"
+import {Stone, AnyStone} from "../../Stone"
 import {SourceHash} from "../../SourceHash"
 import {SourceData} from "../../Source"
 import {Project} from "../../Project"
@@ -34,6 +34,17 @@ export type HxmlConfig = {
 	dce?: null | DCE, 
 	debug?: null | boolean, 
 	defines?: null | MaybeArray<string>, 
+	/**
+	* 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 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.
+	* Do not create cyclic dependencies!
+	*/
+	dependencies?: null | MaybeArray<AnyStone>, 
 	flags?: null | MaybeArray<MaybeArray<string>>, 
 	/**
 	Defaults to the Stone's class name.

package/package.json

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