whet 0.0.30 → 0.0.32

package/bin/Reflect.d.ts

@@ -7,6 +7,19 @@ abstract interface in an untyped manner. Use with care.
 */
 export declare class Reflect {
 	
+	/**
+	Returns the value of the field named `field` on object `o`.
+	
+	If `o` is not an object or has no field named `field`, the result is
+	null.
+	
+	If the field is defined as a property, its accessors are ignored. Refer
+	to `Reflect.getProperty` for a function supporting property accessors.
+	
+	If `field` is null, the result is unspecified.
+	*/
+	static field(o: any, field: string): any
+	
 	/**
 	Returns the fields of structure `o`.
 	

package/bin/Reflect.js

@@ -11,6 +11,25 @@ abstract interface in an untyped manner. Use with care.
 export const Reflect = Register.global("$hxClasses")["Reflect"] = 
 class Reflect {
 	
+	/**
+	Returns the value of the field named `field` on object `o`.
+	
+	If `o` is not an object or has no field named `field`, the result is
+	null.
+	
+	If the field is defined as a property, its accessors are ignored. Refer
+	to `Reflect.getProperty` for a function supporting property accessors.
+	
+	If `field` is null, the result is unspecified.
+	*/
+	static field(o, field) {
+		try {
+			return o[field];
+		}catch (_g) {
+			return null;
+		};
+	}
+	
 	/**
 	Returns the fields of structure `o`.
 	

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.29", "-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.32", "-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/route/Router.d.ts

@@ -19,6 +19,7 @@ export declare class Router {
 	
 	/**
 	* Get combined hash of all sources that fit the `pattern`.
+	* Includes matched serveIds in hash to capture filter effects.
 	*/
 	getHash(pattern?: null | MinimatchType): Promise<SourceHash>
 	

package/bin/whet/route/Router.js

@@ -190,10 +190,12 @@ class Router extends Register.inherits() {
 	
 	/**
 	* Get combined hash of all sources that fit the `pattern`.
+	* Includes matched serveIds in hash to capture filter effects.
 	*/
 	getHash(pattern) {
 		return this.get(pattern).then(function (items) {
 			let uniqueStones = [];
+			let serveIds = [];
 			let _g = 0;
 			while (_g < items.length) {
 				let item = items[_g];
@@ -201,7 +203,17 @@ class Router extends Register.inherits() {
 				if (uniqueStones.indexOf(item.source) == -1) {
 					uniqueStones.push(item.source);
 				};
+				serveIds.push(item.serveId);
 			};
+			serveIds.sort(function (a, b) {
+				if (a < b) {
+					return -1;
+				} else if (a > b) {
+					return 1;
+				} else {
+					return 0;
+				};
+			});
 			let result = new Array(uniqueStones.length);
 			let _g1 = 0;
 			let _g2 = uniqueStones.length;
@@ -210,7 +222,7 @@ class Router extends Register.inherits() {
 				result[i] = uniqueStones[i].getHash();
 			};
 			return Promise.all(result).then(function (hashes) {
-				return SourceHash.merge(...hashes);
+				return SourceHash.merge(...hashes).add(SourceHash.fromString(serveIds.join("\n")));
 			});
 		});
 	}

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);
 	}

package/bin/whet/stones/Server.js

@@ -7,6 +7,7 @@ import * as Http from "http"
 import {Register} from "../../genes/Register.js"
 import {Std} from "../../Std.js"
 import {Reflect as Reflect__1} from "../../Reflect.js"
+import {Lambda} from "../../Lambda.js"
 
 const $global = Register.$global
 
@@ -71,34 +72,63 @@ class Server extends Register.inherits(Stone) {
 		let _gthis = this;
 		switch (req.method) {
 			case "GET":
-				if (id.length == 0 || id.charCodeAt(id.length - 1) == 47) {
-					let id1 = id;
-					let dir = id1.substring(0, id1.lastIndexOf("/") + 1);
-					id = Path.posix.join((dir.length == 0) ? "./" : dir, "index.html");
-				} else if (Path.posix.extname(id) == "") {
-					id = "" + id + "/index.html";
+				let isDirOrNoExt = id.length == 0 || id.charCodeAt(id.length - 1) == 47 || Path.posix.extname(id) == "";
+				let queryPromise;
+				if (isDirOrNoExt) {
+					let searchPattern = id.length == 0 || id.charCodeAt(id.length - 1) == 47;
+					queryPromise = this.config.router.get((searchPattern) ? id + "**" : id + "/**");
+				} else {
+					queryPromise = Promise.resolve([]);
 				};
-				this.config.router.get(id).then(function (routeResult) {
-					let sourcePromise = (routeResult.length > 0) ? routeResult[0].get() : (_gthis.routeDynamic != null) ? _gthis.routeDynamic(id) : Promise.resolve(null);
-					return sourcePromise.then(function (source) {
-						if (source == null) {
-							res.writeHead(404, "File not found.");
+				queryPromise.then(function (dirResults) {
+					if (isDirOrNoExt && dirResults.length == 1) {
+						id = dirResults[0].serveId;
+					} else if (isDirOrNoExt) {
+						if (!req.url.substring(0, (searchIndex > 0) ? searchIndex : req.url.length).endsWith("/")) {
+							let redirectUrl = (searchIndex > 0) ? req.url.substring(0, searchIndex) + "/" + req.url.substring(searchIndex) : req.url + "/";
+							res.writeHead(301, "Moved Permanently", {"Location": redirectUrl});
 							res.end();
 							return;
 						};
-						let headers = {"Content-Type": Mime.getType(Path.posix.extname(id).toLowerCase()), "Last-Modified": new Date(source.source.ctime * 1000).toUTCString(), "Content-Length": Std.string(source.data.length), "Cache-Control": "no-store, no-cache"};
-						if (_gthis.config.headers != null) {
-							let access = _gthis.config.headers;
-							let _g_keys = Reflect__1.fields(access);
-							let _g_index = 0;
-							while (_g_index < _g_keys.length) {
-								let key = _g_keys[_g_index++];
-								headers[key] = access[key];
-							};
+						if (id.length == 0 || id.charCodeAt(id.length - 1) == 47) {
+							let id1 = id;
+							let dir = id1.substring(0, id1.lastIndexOf("/") + 1);
+							id = Path.posix.join((dir.length == 0) ? "./" : dir, "index.html");
+						} else if (Path.posix.extname(id) == "") {
+							id = "" + id + "/index.html";
 						};
-						res.writeHead(200, headers);
-						res.write(source.data, "binary");
-						res.end();
+					};
+					_gthis.config.router.get(id).then(function (routeResult) {
+						let sourcePromise = (routeResult.length > 0) ? routeResult[0].get() : (_gthis.routeDynamic != null) ? _gthis.routeDynamic(id) : Promise.resolve(null);
+						return sourcePromise.then(function (source) {
+							if (source == null) {
+								res.writeHead(404, "File not found.");
+								res.end();
+								return;
+							};
+							let headers = {"Content-Type": Mime.getType(Path.posix.extname(id).toLowerCase()), "Last-Modified": new Date(source.source.ctime * 1000).toUTCString(), "Content-Length": Std.string(source.data.length), "Cache-Control": "no-store, no-cache"};
+							if (_gthis.config.headers != null) {
+								let access = _gthis.config.headers;
+								let _g_keys = Reflect__1.fields(access);
+								let _g_index = 0;
+								while (_g_index < _g_keys.length) {
+									let key = _g_keys[_g_index++];
+									headers[key] = access[key];
+								};
+							};
+							res.writeHead(200, headers);
+							res.write(source.data, "binary");
+							res.end();
+						})["catch"](function (e) {
+							Log.log(40, ...["Server error.", {"error": e}]);
+							res.writeHead(500, "Error happened.", _gthis.config.headers);
+							if (((e) instanceof Error)) {
+								res.write(e.stack, "utf-8");
+							} else {
+								res.write(Std.string(e), "utf-8");
+							};
+							res.end();
+						});
 					})["catch"](function (e) {
 						Log.log(40, ...["Server error.", {"error": e}]);
 						res.writeHead(500, "Error happened.", _gthis.config.headers);
@@ -124,6 +154,68 @@ class Server extends Register.inherits(Stone) {
 				res.writeHead(200, this.config.headers);
 				res.end();
 				break
+			case "POST":
+				let stoneId = Path.posix.join(".", "./", ".", id);
+				let stone = Lambda.find(this.project.stones, function (s) {
+					return s.id == stoneId;
+				});
+				if (stone == null) {
+					let e = "Could not find stone with such id.";
+					Log.log(40, ...["Server error.", {"error": e}]);
+					res.writeHead(500, "Error happened.", _gthis.config.headers);
+					if (((e) instanceof Error)) {
+						res.write(e.stack, "utf-8");
+					} else {
+						res.write(Std.string(e), "utf-8");
+					};
+					res.end();
+				} else {
+					let body = "";
+					req.on("data", function (chunk) {
+						body += chunk;
+						return body;
+					});
+					req.on("end", function () {
+						let request = JSON.parse(body);
+						if (request.config != null) {
+							let _g = 0;
+							let _g1 = Reflect__1.fields(stone.config);
+							while (_g < _g1.length) {
+								let field = _g1[_g];
+								++_g;
+								stone.config[field] = Reflect__1.field(request.config, field);
+							};
+						};
+						if (request.getSource) {
+							stone.getSource().then(function (src) {
+								let resJson = {};
+								let _g = 0;
+								let _g1 = src.data;
+								while (_g < _g1.length) {
+									let data = _g1[_g];
+									++_g;
+									resJson[data.id] = data.data.toString("base64");
+								};
+								res.writeHead(200, _gthis.config.headers);
+								res.write(JSON.stringify(resJson), "utf-8");
+								res.end();
+							})["catch"](function (e) {
+								Log.log(40, ...["Server error.", {"error": e}]);
+								res.writeHead(500, "Error happened.", _gthis.config.headers);
+								if (((e) instanceof Error)) {
+									res.write(e.stack, "utf-8");
+								} else {
+									res.write(Std.string(e), "utf-8");
+								};
+								res.end();
+							});
+						} else {
+							res.writeHead(200, _gthis.config.headers);
+							res.end();
+						};
+					});
+				};
+				break
 			case "PUT":
 				let cmd = [Path.posix.join(".", "./", ".", id)];
 				let body = "";

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "whet",
-    "version": "0.0.30",
+    "version": "0.0.32",
     "description": "NodeJS based assets management and project tooling library.",
     "scripts": {
         "devinit": "npx dts2hx commander pino-pretty --modular --noLibWrap",
@@ -13,7 +13,9 @@
     "files": [
         "bin"
     ],
-    "bin": "bin/whet.js",
+    "bin": {
+        "whet": "bin/whet.js"
+    },
     "main": "bin/whet.js",
     "type": "module",
     "author": "Peter Achberger",

package/bin/List.d.ts

@@ -1,3 +0,0 @@
-import {List as List__1} from "./haxe/ds/List"
-
-export type List<T> = List__1<T>