whet 0.0.29 → 0.0.31

package/bin/whet/SourceHash.d.ts

@@ -15,6 +15,20 @@ export declare class SourceHash {
 	static fromFiles(paths: MaybeArray<string>, filter?: null | ((arg0: string) => boolean), recursive?: boolean): Promise<SourceHash>
 	static fromBytes(data: Buffer): SourceHash
 	static fromString(data: string): SourceHash
+	
+	/**
+	* Converts `obj` to string via JSON.stringify, defaults to 'null' if undefined to prevent
+	* errors. The string is then converted to hash. See also `fromConfig`.
+	*/
+	static fromStringify(obj: any): SourceHash
+	
+	/**
+	* Convert a Stone config into hash by ignoring the base `StoneConfig` fields
+	* and anything inside `ignoreList`, getting hash of `Stone` and `Router` instances,
+	* and applying `fromStringify` on the rest.
+	* Only checks keys at root level, no deep inspection is done.
+	*/
+	static fromConfig(obj: {[key: string]: any}, ignoreList?: null | string[]): Promise<SourceHash>
 	static equals(a: SourceHash, b: SourceHash): boolean
 	static toHex(hash: SourceHash): string
 	static fromHex(hex: string): SourceHash

package/bin/whet/SourceHash.js

@@ -1,9 +1,12 @@
+import {Router} from "./route/Router.js"
 import {MaybeArray_Fields_} from "./magic/MaybeArray.js"
 import {Utils} from "./Utils.js"
+import {Stone} from "./Stone.js"
 import {Register} from "../genes/Register.js"
 import * as Fs from "fs"
 import * as Crypto from "crypto"
 import {Buffer} from "buffer"
+import {Reflect as Reflect__1} from "../Reflect.js"
 
 const $global = Register.$global
 
@@ -115,6 +118,50 @@ class SourceHash extends Register.inherits() {
 	static fromString(data) {
 		return SourceHash.fromBytes(Buffer.from(data));
 	}
+	
+	/**
+	* Converts `obj` to string via JSON.stringify, defaults to 'null' if undefined to prevent
+	* errors. The string is then converted to hash. See also `fromConfig`.
+	*/
+	static fromStringify(obj) {
+		let tmp = JSON.stringify(obj);
+		return SourceHash.fromBytes(Buffer.from((tmp != null) ? tmp : "null"));
+	}
+	
+	/**
+	* Convert a Stone config into hash by ignoring the base `StoneConfig` fields
+	* and anything inside `ignoreList`, getting hash of `Stone` and `Router` instances,
+	* and applying `fromStringify` on the rest.
+	* Only checks keys at root level, no deep inspection is done.
+	*/
+	static fromConfig(obj, ignoreList) {
+		let keys = [];
+		let _g = [];
+		let _g_keys = Reflect__1.fields(obj);
+		let _g_index = 0;
+		while (_g_index < _g_keys.length) {
+			let key = _g_keys[_g_index++];
+			let _g_value = obj[key];
+			let tmp;
+			switch (key) {
+				case "cacheStrategy":case "dependencies":case "id":case "project":
+					continue;
+					break
+				default:
+				if (ignoreList != null && ignoreList.includes(key)) {
+					continue;
+				} else {
+					keys.push(key);
+					tmp = (((_g_value) instanceof Stone)) ? _g_value.getHash() : (((_g_value) instanceof Router)) ? _g_value.getHash() : SourceHash.fromStringify(_g_value);
+				};
+				
+			};
+			_g.push(tmp);
+		};
+		return Promise.all(_g).then(function (hashes) {
+			return SourceHash.merge(...hashes);
+		});
+	}
 	static equals(a, b) {
 		if (a != null && b != null) {
 			return a.bytes.compare(b.bytes) == 0;
@@ -156,8 +203,8 @@ class SourceHash extends Register.inherits() {
 }
 
 
-SourceHash.EMPTY = (function($this) {var $r0
+Register.createStatic(SourceHash, "EMPTY", function () { return (function($this) {var $r0
 	let bytes = Buffer.alloc(32);
 	
 	$r0 = new SourceHash(bytes)
-	return $r0})(this)
+	return $r0})(this) })

package/bin/whet/Whet.js

@@ -12,7 +12,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.28", "-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.enablePositionalOptions().passThroughOptions().description("Project tooling.").usage("[options] [command] [+ [command]...]").version("0.0.31", "-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) {

package/bin/whet/cache/FileCache.js

@@ -14,7 +14,7 @@ import {HxOverrides} from "../../HxOverrides.js"
 const $global = Register.$global
 
 export const FileCache = Register.global("$hxClasses")["whet.cache.FileCache"] = 
-class FileCache extends Register.inherits(BaseCache) {
+class FileCache extends Register.inherits(() => BaseCache, true) {
 	new(rootDir) {
 		this.flushQueued = false;
 		super.new(rootDir, new StringMap());

package/bin/whet/cache/MemoryCache.js

@@ -5,7 +5,7 @@ import {Register} from "../../genes/Register.js"
 const $global = Register.$global
 
 export const MemoryCache = Register.global("$hxClasses")["whet.cache.MemoryCache"] = 
-class MemoryCache extends Register.inherits(BaseCache) {
+class MemoryCache extends Register.inherits(() => BaseCache, true) {
 	new(rootDir) {
 		super.new(rootDir, new ObjectMap());
 	}

package/bin/whet/stones/Files.js

@@ -8,7 +8,7 @@ import {Register} from "../../genes/Register.js"
 const $global = Register.$global
 
 export const Files = Register.global("$hxClasses")["whet.stones.Files"] = 
-class Files extends Register.inherits(Stone) {
+class Files extends Register.inherits(() => Stone, true) {
 	new(config) {
 		super.new(config);
 	}
@@ -19,13 +19,19 @@ class Files extends Register.inherits(Stone) {
 		let _gthis = this;
 		let onDirFile = function (dir, dirFile) {
 			let pathId = IdUtils.fromCwdPath(dirFile, RootDir.fromProject(_gthis.project));
-			if (!(dir.length == 0 || dir.charCodeAt(dir.length - 1) == 47)) {
-				throw new Error("\"" + dir + "\" is not a directory.");
-			};
 			let inlobj_id;
-			let dir1 = pathId.substring(0, pathId.lastIndexOf("/") + 1);
-			inlobj_id = ((dir1.length == 0) ? "./" : dir1).indexOf(dir) == 0;
-			return (inlobj_id) ? pathId.substring(dir.length) : null;
+			if (dir == "/") {
+				inlobj_id = pathId;
+			} else {
+				if (!(dir.length == 0 || dir.charCodeAt(dir.length - 1) == 47)) {
+					throw new Error("\"" + dir + "\" is not a directory.");
+				};
+				let inlobj_id1;
+				let dir1 = pathId.substring(0, pathId.lastIndexOf("/") + 1);
+				inlobj_id1 = ((dir1.length == 0) ? "./" : dir1).indexOf(dir) == 0;
+				inlobj_id = (inlobj_id1) ? pathId.substring(dir.length) : null;
+			};
+			return inlobj_id;
 		};
 		let files = [];
 		let dirs = [];
@@ -51,14 +57,20 @@ class Files extends Register.inherits(Stone) {
 	generate(hash) {
 		let _gthis = this;
 		let onDirFile = function (dir, dirFile) {
+			let p_id;
 			let pathId = IdUtils.fromCwdPath(dirFile, RootDir.fromProject(_gthis.project));
-			if (!(dir.length == 0 || dir.charCodeAt(dir.length - 1) == 47)) {
-				throw new Error("\"" + dir + "\" is not a directory.");
+			if (dir == "/") {
+				p_id = pathId;
+			} else {
+				if (!(dir.length == 0 || dir.charCodeAt(dir.length - 1) == 47)) {
+					throw new Error("\"" + dir + "\" is not a directory.");
+				};
+				let p_id1;
+				let dir1 = pathId.substring(0, pathId.lastIndexOf("/") + 1);
+				p_id1 = ((dir1.length == 0) ? "./" : dir1).indexOf(dir) == 0;
+				p_id = (p_id1) ? pathId.substring(dir.length) : null;
 			};
-			let p_id;
-			let dir1 = pathId.substring(0, pathId.lastIndexOf("/") + 1);
-			p_id = ((dir1.length == 0) ? "./" : dir1).indexOf(dir) == 0;
-			return SourceData.fromFile((p_id) ? pathId.substring(dir.length) : null, dirFile, pathId);
+			return SourceData.fromFile(p_id, dirFile, pathId);
 		};
 		let files = [];
 		let dirs = [];
@@ -106,13 +118,19 @@ class Files extends Register.inherits(Stone) {
 	}
 	fromCwd(file, dir) {
 		let pathId = IdUtils.fromCwdPath(file, RootDir.fromProject(this.project));
-		if (!(dir.length == 0 || dir.charCodeAt(dir.length - 1) == 47)) {
-			throw new Error("\"" + dir + "\" is not a directory.");
-		};
 		let tmp;
-		let dir1 = pathId.substring(0, pathId.lastIndexOf("/") + 1);
-		tmp = ((dir1.length == 0) ? "./" : dir1).indexOf(dir) == 0;
-		return {"pathId": pathId, "id": (tmp) ? pathId.substring(dir.length) : null};
+		if (dir == "/") {
+			tmp = pathId;
+		} else {
+			if (!(dir.length == 0 || dir.charCodeAt(dir.length - 1) == 47)) {
+				throw new Error("\"" + dir + "\" is not a directory.");
+			};
+			let tmp1;
+			let dir1 = pathId.substring(0, pathId.lastIndexOf("/") + 1);
+			tmp1 = ((dir1.length == 0) ? "./" : dir1).indexOf(dir) == 0;
+			tmp = (tmp1) ? pathId.substring(dir.length) : null;
+		};
+		return {"pathId": pathId, "id": tmp};
 	}
 	static get __name__() {
 		return "whet.stones.Files"

package/package.json

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