whet 0.0.15 → 0.0.18

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.find(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/bin/whet/stones/Zip.js

@@ -36,27 +36,7 @@ class ZipStone extends Register.inherits(Stone) {
 	}
 	generateHash() {
 		var _gthis = this;
-		var _this = new Router(this.config.sources).routes;
-		var result = new Array(_this.length);
-		var _g = 0;
-		var _g1 = _this.length;
-		while (_g < _g1) {
-			var i = _g++;
-			var _this1 = _this[i].route.routes;
-			var result1 = new Array(_this1.length);
-			var _g2 = 0;
-			var _g3 = _this1.length;
-			while (_g2 < _g3) {
-				var i1 = _g2++;
-				result1[i1] = _this1[i1].stone.getHash();
-			};
-			result[i] = Promise.all(result1).then(function (hashes) {
-				return SourceHash.merge(...hashes);
-			});
-		};
-		return Promise.all(result).then(function (hashes) {
-			return SourceHash.merge(...hashes);
-		}).then(function (hash) {
+		return new Router(this.config.sources).getHash().then(function (hash) {
 			return SourceHash.fromString(_gthis.config.filename + _gthis.config.level).add(hash);
 		});
 	}
@@ -64,7 +44,7 @@ class ZipStone extends Register.inherits(Stone) {
 		var _gthis = this;
 		Log.log(30, ...["Zipping files."]);
 		var level = this.config.level;
-		return new Router(this.config.sources).find("/").then(function (files) {
+		return new Router(this.config.sources).get().then(function (files) {
 			var _g = [];
 			var _g1 = 0;
 			while (_g1 < files.length) {

package/bin/whet.d.ts

@@ -7,7 +7,6 @@ export {Stone} from "./whet/Stone"
 export {ServerConfig} from "./whet/stones/Server"
 export {Server} from "./whet/stones/Server"
 export {Router} from "./whet/route/Router"
-export {Route} from "./whet/route/Route"
 export {RemoteFileConfig} from "./whet/stones/RemoteFile"
 export {RemoteFile} from "./whet/stones/RemoteFile"
 export {Project} from "./whet/Project"

package/bin/whet.js

@@ -11,7 +11,6 @@ export {Utils} from "./whet/Utils.js"
 export {Stone} from "./whet/Stone.js"
 export {Server} from "./whet/stones/Server.js"
 export {Router} from "./whet/route/Router.js"
-export {Route} from "./whet/route/Route.js"
 export {RemoteFile} from "./whet/stones/RemoteFile.js"
 export {Project} from "./whet/Project.js"
 export {Log} from "./whet/Log.js"

package/package.json

@@ -1,9 +1,9 @@
 {
     "name": "whet",
-    "version": "0.0.15",
+    "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": {
@@ -24,9 +24,12 @@
     "homepage": "https://github.com/Antriel/whet#readme",
     "dependencies": {
         "commander": "^9.0.0",
-        "mime": "^3.0.0"
+        "mime": "^3.0.0",
+        "minimatch": "^5.1.0",
+        "pino-pretty": "^9.1.0"
     },
     "devDependencies": {
+        "@types/minimatch": "^5.1.0",
         "dts2hx": "^0.18.1",
         "lix": "^15.11.6"
     }

package/bin/StringBuf.d.ts

@@ -1,13 +0,0 @@
-
-/**
-A String buffer is an efficient way to build a big string by appending small
-elements together.
-
-Unlike String, an instance of StringBuf is not immutable in the sense that
-it can be passed as argument to functions which modify it by appending more
-values.
-*/
-export declare class StringBuf {
-	constructor()
-	protected b: string
-}

package/bin/StringBuf.js

@@ -1,25 +0,0 @@
-import {Register} from "./genes/Register.js"
-
-const $global = Register.$global
-
-/**
-A String buffer is an efficient way to build a big string by appending small
-elements together.
-
-Unlike String, an instance of StringBuf is not immutable in the sense that
-it can be passed as argument to functions which modify it by appending more
-values.
-*/
-export const StringBuf = Register.global("$hxClasses")["StringBuf"] = 
-class StringBuf extends Register.inherits() {
-	new() {
-		this.b = "";
-	}
-	static get __name__() {
-		return "StringBuf"
-	}
-	get __class__() {
-		return StringBuf
-	}
-}
-

package/bin/haxe/CallStack.d.ts

@@ -1,41 +0,0 @@
-import {StringBuf} from "../StringBuf"
-
-/**
-Elements return by `CallStack` methods.
-*/
-export declare namespace StackItem {
-	export type Module = {_hx_index: 1, m: string, __enum__: "haxe.StackItem"}
-	export const Module: (m: string) => StackItem
-	export type Method = {_hx_index: 3, classname: null | string, method: string, __enum__: "haxe.StackItem"}
-	export const Method: (classname: null | string, method: string) => StackItem
-	export type LocalFunction = {_hx_index: 4, v: null | number, __enum__: "haxe.StackItem"}
-	export const LocalFunction: (v: null | number) => StackItem
-	export type FilePos = {_hx_index: 2, s: null | StackItem, file: string, line: number, column: null | number, __enum__: "haxe.StackItem"}
-	export const FilePos: (s: null | StackItem, file: string, line: number, column: null | number) => StackItem
-	export type CFunction = {_hx_index: 0, __enum__: "haxe.StackItem"}
-	export const CFunction: CFunction
-}
-
-/**
-Elements return by `CallStack` methods.
-*/
-export declare type StackItem = 
-	| StackItem.Module
-	| StackItem.Method
-	| StackItem.LocalFunction
-	| StackItem.FilePos
-	| StackItem.CFunction
-
-export declare class CallStack {
-	
-	/**
-	Return the call stack elements, or an empty array if not available.
-	*/
-	static callStack(): StackItem[]
-	
-	/**
-	Returns a representation of the stack as a printable string.
-	*/
-	static toString(stack: StackItem[]): string
-	protected static itemToString(b: StringBuf, s: StackItem): void
-}

package/bin/haxe/CallStack.js

@@ -1,96 +0,0 @@
-import {NativeStackTrace} from "./NativeStackTrace.js"
-import {Register} from "../genes/Register.js"
-import {StringBuf} from "../StringBuf.js"
-import {Std} from "../Std.js"
-
-const $global = Register.$global
-
-/**
-Elements return by `CallStack` methods.
-*/
-export const StackItem = 
-Register.global("$hxEnums")["haxe.StackItem"] = 
-{
-	__ename__: "haxe.StackItem",
-	
-	CFunction: {_hx_name: "CFunction", _hx_index: 0, __enum__: "haxe.StackItem"},
-	Module: Object.assign((m) => ({_hx_index: 1, __enum__: "haxe.StackItem", "m": m}), {_hx_name: "Module", __params__: ["m"]}),
-	FilePos: Object.assign((s, file, line, column) => ({_hx_index: 2, __enum__: "haxe.StackItem", "s": s, "file": file, "line": line, "column": column}), {_hx_name: "FilePos", __params__: ["s", "file", "line", "column"]}),
-	Method: Object.assign((classname, method) => ({_hx_index: 3, __enum__: "haxe.StackItem", "classname": classname, "method": method}), {_hx_name: "Method", __params__: ["classname", "method"]}),
-	LocalFunction: Object.assign((v) => ({_hx_index: 4, __enum__: "haxe.StackItem", "v": v}), {_hx_name: "LocalFunction", __params__: ["v"]})
-}
-StackItem.__constructs__ = [StackItem.CFunction, StackItem.Module, StackItem.FilePos, StackItem.Method, StackItem.LocalFunction]
-StackItem.__empty_constructs__ = [StackItem.CFunction]
-
-export const CallStack = Register.global("$hxClasses")["haxe._CallStack.CallStack"] = 
-class CallStack {
-	
-	/**
-	Return the call stack elements, or an empty array if not available.
-	*/
-	static callStack() {
-		return NativeStackTrace.toHaxe(NativeStackTrace.callStack());
-	}
-	
-	/**
-	Returns a representation of the stack as a printable string.
-	*/
-	static toString(stack) {
-		var b = new StringBuf();
-		var _g = 0;
-		var _g1 = stack;
-		while (_g < _g1.length) {
-			var s = _g1[_g++];
-			b.b += "\nCalled from ";
-			CallStack.itemToString(b, s);
-		};
-		return b.b;
-	}
-	static itemToString(b, s) {
-		switch (s._hx_index) {
-			case 0:
-				b.b += "a C function";
-				break
-			case 1:
-				var _g = s.m;
-				b.b = (b.b += "module ") + ((_g == null) ? "null" : "" + _g);
-				break
-			case 2:
-				var _g = s.s;
-				var _g1 = s.file;
-				var _g2 = s.line;
-				var _g3 = s.column;
-				if (_g != null) {
-					CallStack.itemToString(b, _g);
-					b.b += " (";
-				};
-				b.b = (b.b += (_g1 == null) ? "null" : "" + _g1) + " line ";
-				b.b += (_g2 == null) ? "null" : "" + _g2;
-				if (_g3 != null) {
-					b.b = (b.b += " column ") + ((_g3 == null) ? "null" : "" + _g3);
-				};
-				if (_g != null) {
-					b.b += ")";
-				};
-				break
-			case 3:
-				var _g = s.classname;
-				var _g1 = s.method;
-				b.b = (b.b += Std.string((_g == null) ? "<unknown>" : _g)) + ".";
-				b.b += (_g1 == null) ? "null" : "" + _g1;
-				break
-			case 4:
-				var _g = s.v;
-				b.b = (b.b += "local function #") + ((_g == null) ? "null" : "" + _g);
-				break
-			
-		};
-	}
-	static get __name__() {
-		return "haxe._CallStack.CallStack_Impl_"
-	}
-	get __class__() {
-		return CallStack
-	}
-}
-

package/bin/haxe/NativeStackTrace.js

@@ -1,147 +0,0 @@
-import {StackItem} from "./CallStack.js"
-import {Register} from "../genes/Register.js"
-import {StringTools} from "../StringTools.js"
-import {Std} from "../Std.js"
-
-const $global = Register.$global
-
-/**
-Do not use manually.
-*/
-export const NativeStackTrace = Register.global("$hxClasses")["haxe.NativeStackTrace"] = 
-class NativeStackTrace {
-	static callStack() {
-		var e = new Error("");
-		var stack = NativeStackTrace.tryHaxeStack(e);
-		if (typeof(stack) == "undefined") {
-			try {
-				throw e;
-			}catch (_g) {
-			};
-			stack = e.stack;
-		};
-		return NativeStackTrace.normalize(stack, 2);
-	}
-	static toHaxe(s, skip) {
-		if (skip == null) {
-			skip = 0;
-		};
-		if (s == null) {
-			return [];
-		} else if (typeof(s) == "string") {
-			var stack = s.split("\n");
-			if (stack[0] == "Error") {
-				stack.shift();
-			};
-			var m = [];
-			var _g = 0;
-			var _g1 = stack.length;
-			while (_g < _g1) {
-				var i = _g++;
-				if (skip > i) {
-					continue;
-				};
-				var line = stack[i];
-				var matched = line.match(/^    at ([A-Za-z0-9_. ]+) \(([^)]+):([0-9]+):([0-9]+)\)$/);
-				if (matched != null) {
-					var path = matched[1].split(".");
-					if (path[0] == "$hxClasses") {
-						path.shift();
-					};
-					var meth = path.pop();
-					var file = matched[2];
-					var line1 = Std.parseInt(matched[3]);
-					var column = Std.parseInt(matched[4]);
-					m.push(StackItem.FilePos((meth == "Anonymous function") ? StackItem.LocalFunction() : (meth == "Global code") ? null : StackItem.Method(path.join("."), meth), file, line1, column));
-				} else {
-					m.push(StackItem.Module(StringTools.trim(line)));
-				};
-			};
-			return m;
-		} else if (skip > 0 && Array.isArray(s)) {
-			return s.slice(skip);
-		} else {
-			return s;
-		};
-	}
-	static tryHaxeStack(e) {
-		if (e == null) {
-			return [];
-		};
-		var oldValue = Error.prepareStackTrace;
-		Error.prepareStackTrace = NativeStackTrace.prepareHxStackTrace;
-		Error.prepareStackTrace = oldValue;
-		return e.stack;
-	}
-	static prepareHxStackTrace(e, callsites) {
-		var stack = [];
-		var _g = 0;
-		while (_g < callsites.length) {
-			var site = callsites[_g];
-			++_g;
-			if (NativeStackTrace.wrapCallSite != null) {
-				site = NativeStackTrace.wrapCallSite(site);
-			};
-			var method = null;
-			var fullName = site.getFunctionName();
-			if (fullName != null) {
-				var idx = fullName.lastIndexOf(".");
-				if (idx >= 0) {
-					method = StackItem.Method(fullName.substring(0, idx), fullName.substring(idx + 1));
-				} else {
-					method = StackItem.Method(null, fullName);
-				};
-			};
-			var fileName = site.getFileName();
-			var fileAddr = (fileName == null) ? -1 : fileName.indexOf("file:");
-			if (NativeStackTrace.wrapCallSite != null && fileAddr > 0) {
-				fileName = fileName.substring(fileAddr + 6);
-			};
-			stack.push(StackItem.FilePos(method, fileName, site.getLineNumber(), site.getColumnNumber()));
-		};
-		return stack;
-	}
-	static normalize(stack, skipItems) {
-		if (skipItems == null) {
-			skipItems = 0;
-		};
-		if (Array.isArray(stack) && skipItems > 0) {
-			return stack.slice(skipItems);
-		} else if (typeof(stack) == "string") {
-			switch (stack.substring(0, 6)) {
-				case "Error\n":case "Error:":
-					++skipItems;
-					break
-				default:
-				
-			};
-			return NativeStackTrace.skipLines(stack, skipItems);
-		} else {
-			return stack;
-		};
-	}
-	static skipLines(stack, skip, pos) {
-		if (pos == null) {
-			pos = 0;
-		};
-		while (true) if (skip > 0) {
-			pos = stack.indexOf("\n", pos);
-			if (pos < 0) {
-				return "";
-			} else {
-				skip = --skip;
-				pos += 1;
-				continue;
-			};
-		} else {
-			return stack.substring(pos);
-		};
-	}
-	static get __name__() {
-		return "haxe.NativeStackTrace"
-	}
-	get __class__() {
-		return NativeStackTrace
-	}
-}
-

package/bin/haxe/io/Path.d.ts

@@ -1,109 +0,0 @@
-
-/**
-This class provides a convenient way of working with paths. It supports the
-common path formats:
-
-- `directory1/directory2/filename.extension`
-- `directory1\directory2\filename.extension`
-*/
-export declare class Path {
-	constructor(path: string)
-	
-	/**
-	The directory.
-	
-	This is the leading part of the path that is not part of the file name
-	and the extension.
-	
-	Does not end with a `/` or `\` separator.
-	
-	If the path has no directory, the value is `null`.
-	*/
-	dir: null | string
-	
-	/**
-	The file name.
-	
-	This is the part of the part between the directory and the extension.
-	
-	If there is no file name, e.g. for `".htaccess"` or `"/dir/"`, the value
-	is the empty String `""`.
-	*/
-	file: string
-	
-	/**
-	The file extension.
-	
-	It is separated from the file name by a dot. This dot is not part of
-	the extension.
-	
-	If the path has no extension, the value is `null`.
-	*/
-	ext: null | string
-	
-	/**
-	`true` if the last directory separator is a backslash, `false` otherwise.
-	*/
-	backslash: boolean
-	
-	/**
-	Returns a String representation of `this` path.
-	
-	If `this.backslash` is `true`, backslash is used as directory separator,
-	otherwise slash is used. This only affects the separator between
-	`this.dir` and `this.file`.
-	
-	If `this.directory` or `this.extension` is `null`, their representation
-	is the empty String `""`.
-	*/
-	toString(): string
-	
-	/**
-	Returns the String representation of `path` without the directory.
-	
-	If `path` is `null`, the result is unspecified.
-	*/
-	static withoutDirectory(path: string): string
-	
-	/**
-	Returns the directory of `path`.
-	
-	If the directory is `null`, the empty String `""` is returned.
-	
-	If `path` is `null`, the result is unspecified.
-	*/
-	static directory(path: string): string
-	
-	/**
-	Returns the extension of `path`.
-	
-	If `path` has no extension, the empty String `""` is returned.
-	
-	If `path` is `null`, the result is unspecified.
-	*/
-	static extension(path: string): string
-	
-	/**
-	Normalize a given `path` (e.g. turn `'/usr/local/../lib'` into `'/usr/lib'`).
-	
-	Also replaces backslashes `\` with slashes `/` and afterwards turns
-	multiple slashes into a single one.
-	
-	If `path` is `null`, the result is unspecified.
-	*/
-	static normalize(path: string): string
-	
-	/**
-	Adds a trailing slash to `path`, if it does not have one already.
-	
-	If the last slash in `path` is a backslash, a backslash is appended to
-	`path`.
-	
-	If the last slash in `path` is a slash, or if no slash is found, a slash
-	is appended to `path`. In particular, this applies to the empty String
-	`""`.
-	
-	If `path` is `null`, the result is unspecified.
-	*/
-	static addTrailingSlash(path: string): string
-}