whet 0.0.17 → 0.0.18

package/bin/pino_pretty/PrettyOptions.d.ts

@@ -0,0 +1,98 @@
+
+export type PrettyOptions = {
+	/**
+	Opens the file with the 'a' flag.
+	*/
+	append?: null | boolean, 
+	/**
+	If set to true, will add color information to the formatted output message.
+	*/
+	colorize?: null | boolean, 
+	/**
+	Appends carriage return and line feed, instead of just a line feed, to the formatted log line.
+	*/
+	crlf?: null | boolean, 
+	/**
+	Provides the ability to add a custom prettify function for specific log properties.
+	`customPrettifiers` is an object, where keys are log properties that will be prettified
+	and value is the prettify function itself.
+	For example, if a log line contains a query property, you can specify a prettifier for it:
+	*/
+	customPrettifiers?: null | {
+	}, 
+	/**
+	The file, file descriptor, or stream to write to.  Defaults to 1 (stdout).
+	*/
+	destination?: null | any, 
+	/**
+	Define the log keys that are associated with error like objects.
+	*/
+	errorLikeObjectKeys?: null | string[], 
+	/**
+	When formatting an error object, display this list of properties.
+	The list should be a comma separated list of properties.
+	*/
+	errorProps?: null | string, 
+	/**
+	Hide objects from output (but not error object).
+	*/
+	hideObject?: null | boolean, 
+	/**
+	Ignore one or several keys.
+	Will be overridden by the option include if include is presented.
+	*/
+	ignore?: null | string, 
+	/**
+	Include one or several keys.
+	*/
+	include?: null | string, 
+	/**
+	If set to true, it will print the name of the log level as the first field in the log line.
+	*/
+	levelFirst?: null | boolean, 
+	/**
+	Define the key that contains the level of the log.
+	*/
+	levelKey?: null | string, 
+	/**
+	Output the log level using the specified label.
+	*/
+	levelLabel?: null | string, 
+	/**
+	Format output of message, e.g. {level} - {pid} will output message: INFO - 1123
+	*/
+	messageFormat?: null | any, 
+	/**
+	The key in the JSON object to use as the highlighted message.
+	*/
+	messageKey?: null | string, 
+	/**
+	The minimum log level to include in the output.
+	*/
+	minimumLevel?: null | any, 
+	/**
+	Ensure directory for destination file exists.
+	*/
+	mkdir?: null | boolean, 
+	/**
+	Print each log message on a single line (errors will still be multi-line).
+	*/
+	singleLine?: null | boolean, 
+	/**
+	Makes messaging synchronous.
+	*/
+	sync?: null | boolean, 
+	/**
+	The key in the JSON object to use for timestamp display.
+	*/
+	timestampKey?: null | string, 
+	/**
+	Translate the epoch time value into a human readable date and time string. This flag also can set the format
+	string to apply when translating the date to human readable format. For a list of available pattern letters
+	see the {@link https://www.npmjs.com/package/dateformat|dateformat documentation}.
+	- The default format is `yyyy-mm-dd HH:MM:ss.l o` in UTC.
+	- Requires a `SYS:` prefix to translate time to the local system's timezone. Use the shortcut `SYS:standard`
+	to translate time to `yyyy-mm-dd HH:MM:ss.l o` in system timezone.
+	*/
+	translateTime?: null | any
+}

package/bin/pino_pretty/default_/MessageFormatFunc.d.ts

@@ -0,0 +1,3 @@
+
+export type MessageFormatFunc = ((log: {
+}, messageKey: string, levelLabel: string) => string)

package/bin/whet/Log.d.ts

@@ -7,6 +7,7 @@ export declare class Log {
 	static error(...args: any[]): void
 	static fatal(...args: any[]): void
 	static logLevel: number
+	static stream: IWritable
 	protected static log(level: number, ...args: any[]): void
 	protected static replacer(key: any, val: any): any
 }

package/bin/whet/Log.js

@@ -50,12 +50,12 @@ class Log {
 					};
 				};
 			};
-			process.stdout.write(JSON.stringify(out, Log.replacer) + "\n");
+			Log.stream.write(JSON.stringify(out, Log.replacer) + "\n");
 		};
 	}
 	static replacer(key, val) {
 		if (((val) instanceof Error)) {
-			return val.stack;
+			return {"type": val.name, "message": val.message, "stack": val.stack};
 		};
 		if (val != null && typeof(val.toString) == "function" && val.toString != Object.prototype.toString) {
 			return val.toString();
@@ -72,6 +72,7 @@ class Log {
 
 
 Log.logLevel = 30
+Log.stream = process.stdout
 export const LogLevel = Register.global("$hxClasses")["whet._Log.LogLevel"] = 
 class LogLevel {
 	static fromString(s) {

package/bin/whet/Stone.js

@@ -161,6 +161,7 @@ class Stone extends Register.inherits() {
 	* @param err Any error that might have happened during `generateSource`.
 	*/
 	handleError(err) {
+		Log.log(50, ...["Error while generating.", {"stone": this, "err": err}]);
 		return Promise.reject(err);
 	}
 	

package/bin/whet/Whet.d.ts

@@ -2,3 +2,4 @@ import {Command} from "commander"
 
 export const program: Command
 export const main: () => void
+export const executeCommand: (cmd: string[]) => Promise<Command>

package/bin/whet/Whet.js

@@ -1,6 +1,7 @@
 import {Project} from "./Project.js"
 import {LogLevel, Log} from "./Log.js"
 import * as Url from "url"
+import * as PinoPretty from "pino-pretty"
 import {Register} from "../genes/Register.js"
 import {Command, CommanderError} from "commander"
 import {Std} from "../Std.js"
@@ -10,7 +11,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.17", "-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").exitOverride();
+		Whet_Fields_.program.enablePositionalOptions().passThroughOptions().description("Project tooling.").usage("[options] [command] [+ [command]...]").version("0.0.18", "-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.parse();
 		var options = Whet_Fields_.program.opts();
 		if (options.logLevel != null) {
@@ -24,6 +25,9 @@ class Whet_Fields_ {
 				Log.logLevel = n;
 			};
 		};
+		if (options.pretty) {
+			Log.stream = PinoPretty["default"]();
+		};
 		global.setImmediate(Whet_Fields_.init, options);
 	}
 	static init(options) {
@@ -41,7 +45,10 @@ class Whet_Fields_ {
 				if (((e) instanceof Error)) {
 					Log.log(50, ...[e.stack]);
 				};
-				return Whet_Fields_.program.help();
+				try {
+					Whet_Fields_.program.help();
+				}catch (_g) {
+				};
 			});
 		};
 	}
@@ -98,6 +105,10 @@ class Whet_Fields_ {
 			nextCommand();
 		});
 	}
+	static executeCommand(cmd) {
+		Log.log(10, ...["Executing command.", {"command": cmd}]);
+		return Whet_Fields_.program.parseAsync(cmd, {"from": "user"});
+	}
 	static getCommands(args) {
 		var commands = [];
 		var from = 0;
@@ -124,3 +135,4 @@ class Whet_Fields_ {
 Whet_Fields_.program = new Command("whet")
 export const program = Whet_Fields_.program
 export const main = Whet_Fields_.main
+export const executeCommand = Whet_Fields_.executeCommand

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

@@ -42,6 +42,7 @@ export type ServerConfig = {
 	* Do not create cyclic dependencies!
 	*/
 	dependencies?: null | MaybeArray<AnyStone>, 
+	headers?: null | {[key: string]: string}, 
 	/**
 	Defaults to the Stone's class name.
 	*/

package/bin/whet/stones/Server.js

@@ -1,3 +1,4 @@
+import {Whet_Fields_} from "../Whet.js"
 import {Stone} from "../Stone.js"
 import {Log} from "../Log.js"
 import * as Path from "path"
@@ -6,6 +7,7 @@ import * as Http from "http"
 import {Register} from "../../genes/Register.js"
 import {StringTools} from "../../StringTools.js"
 import {Std} from "../../Std.js"
+import {Reflect as Reflect__1} from "../../Reflect.js"
 import {HxOverrides} from "../../HxOverrides.js"
 
 const $global = Register.$global
@@ -75,41 +77,62 @@ class Server extends Register.inherits(Stone) {
 			s = str;
 			id = (HxOverrides.cca(s, 0) == 47) ? s : "/" + s;
 		};
-		if (req.method == "GET") {
-			if (HxOverrides.cca(id, id.length - 1) == 47) {
-				if ("index.html".length > 0) {
-					var s = id.substring(0, id.lastIndexOf("/") + 1);
+		switch (req.method) {
+			case "GET":
+				if (HxOverrides.cca(id, id.length - 1) == 47) {
+					if ("index.html".length > 0) {
+						var s = id.substring(0, id.lastIndexOf("/") + 1);
+						var str = (s.length > 1 && HxOverrides.cca(s, 0) == 47) ? s.substring(1) : s;
+						if (str.length > 0) {
+							str = Path.posix.normalize(str);
+							str = StringTools.replace(str, "\\", "/");
+						};
+						s = str;
+						id = ((HxOverrides.cca(s, 0) == 47) ? s : "/" + s) + "index.html";
+					};
+				} else if (Path.posix.extname(id) == "") {
+					var s = "" + id + "/index.html";
 					var str = (s.length > 1 && HxOverrides.cca(s, 0) == 47) ? s.substring(1) : s;
 					if (str.length > 0) {
 						str = Path.posix.normalize(str);
 						str = StringTools.replace(str, "\\", "/");
 					};
 					s = str;
-					id = ((HxOverrides.cca(s, 0) == 47) ? s : "/" + s) + "index.html";
-				};
-			} else if (Path.posix.extname(id) == "") {
-				var s = "" + id + "/index.html";
-				var str = (s.length > 1 && HxOverrides.cca(s, 0) == 47) ? s.substring(1) : s;
-				if (str.length > 0) {
-					str = Path.posix.normalize(str);
-					str = StringTools.replace(str, "\\", "/");
+					id = (HxOverrides.cca(s, 0) == 47) ? s : "/" + s;
 				};
-				s = str;
-				id = (HxOverrides.cca(s, 0) == 47) ? s : "/" + s;
-			};
-			this.config.router.get(id).then(function (routeResult) {
-				return ((routeResult.length > 0) ? routeResult[0].get() : (_gthis.routeDynamic != null) ? _gthis.routeDynamic(id) : Promise.resolve(null)).then(function (source) {
-					if (source == null) {
-						res.writeHead(404, "File not found.");
+				this.config.router.get(id).then(function (routeResult) {
+					return ((routeResult.length > 0) ? routeResult[0].get() : (_gthis.routeDynamic != null) ? _gthis.routeDynamic(id) : Promise.resolve(null)).then(function (source) {
+						if (source == null) {
+							res.writeHead(404, "File not found.");
+							res.end();
+							return;
+						};
+						var 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) {
+							var access = _gthis.config.headers;
+							var _g_keys = Reflect__1.fields(access);
+							var _g_index = 0;
+							while (_g_index < _g_keys.length) {
+								var key = _g_keys[_g_index++];
+								headers[key] = access[key];
+							};
+						};
+						res.writeHead(200, headers);
+						res.write(source.data, "binary");
 						res.end();
-						return;
-					};
-					res.writeHead(200, {"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"});
-					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.");
+					res.writeHead(500, "Error happened.", _gthis.config.headers);
 					if (((e) instanceof Error)) {
 						res.write(e.stack, "utf-8");
 					} else {
@@ -117,19 +140,52 @@ class Server extends Register.inherits(Stone) {
 					};
 					res.end();
 				});
-			})["catch"](function (e) {
-				Log.log(40, ...["Server error.", {"error": e}]);
-				res.writeHead(500, "Error happened.");
-				if (((e) instanceof Error)) {
-					res.write(e.stack, "utf-8");
-				} else {
-					res.write(Std.string(e), "utf-8");
-				};
+				break
+			case "OPTIONS":
+				res.writeHead(200, this.config.headers);
 				res.end();
-			});
-		} else {
+				break
+			case "PUT":
+				var s = "/";
+				var str = ("/".length > 1 && HxOverrides.cca("/", 0) == 47) ? "/".substring(1) : "/";
+				if (str.length > 0) {
+					str = Path.posix.normalize(str);
+					str = StringTools.replace(str, "\\", "/");
+				};
+				s = str;
+				var root = (HxOverrides.cca(s, 0) == 47) ? s : "/" + s;
+				if (id.charAt(0) != "/") {
+					throw new Error("Badly formed SourceId.");
+				};
+				var cmd = [Path.posix.join(".", root, ".", id)];
+				var body = "";
+				req.on("data", function (chunk) {
+					body += chunk;
+					return body;
+				});
+				req.on("end", function () {
+					if (body != "") {
+						cmd.push(body);
+					};
+					return Whet_Fields_.executeCommand(cmd).then(function (_) {
+						res.writeHead(200, _gthis.config.headers);
+						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();
+					});
+				});
+				break
+			default:
 			res.writeHead(400, "Unsupported method.");
 			res.end();
+			
 		};
 	}
 	static get __name__() {

package/package.json

@@ -1,9 +1,9 @@
 {
     "name": "whet",
-    "version": "0.0.17",
+    "version": "0.0.18",
     "description": "NodeJS based assets management and project tooling library.",
     "scripts": {
-        "devinit": "npx dts2hx commander --modular --noLibWrap",
+        "devinit": "npx dts2hx commander pino-pretty --modular --noLibWrap",
         "build": "npx haxe build.hxml"
     },
     "repository": {
@@ -25,7 +25,8 @@
     "dependencies": {
         "commander": "^9.0.0",
         "mime": "^3.0.0",
-        "minimatch": "^5.1.0"
+        "minimatch": "^5.1.0",
+        "pino-pretty": "^9.1.0"
     },
     "devDependencies": {
         "@types/minimatch": "^5.1.0",