whet 0.0.23 → 0.0.25

package/bin/Std.d.ts

@@ -29,21 +29,22 @@ export declare class Std {
 	
 	Leading whitespaces are ignored.
 	
-	If `x` starts with 0x or 0X, hexadecimal notation is recognized where the following digits may
-	contain 0-9 and A-F.
+	`x` may optionally start with a + or - to denote a postive or negative value respectively.
 	
-	Otherwise `x` is read as decimal number with 0-9 being allowed characters. `x` may also start with
-	a - to denote a negative value.
+	If the optional sign is followed 0x or 0X, hexadecimal notation is recognized where the following
+	digits may contain 0-9 and A-F. Both the prefix and digits are case insensitive.
 	
-	In decimal mode, parsing continues until an invalid character is detected, in which case the
-	result up to that point is returned. For hexadecimal notation, the effect of invalid characters
-	is unspecified.
+	Otherwise `x` is read as decimal number with 0-9 being allowed characters. Octal and binary
+	notations are not supported.
+	
+	Parsing continues until an invalid character is detected, in which case the result up to
+	that point is returned. Scientific notation is not supported. That is `Std.parseInt('10e2')` produces `10`.
 	
-	Leading 0s that are not part of the 0x/0X hexadecimal notation are ignored, which means octal
-	notation is not supported.
+	If `x` is `null`, the result is `null`.
+	If `x` cannot be parsed as integer or is empty, the result is `null`.
 	
-	If `x` is null, the result is unspecified.
-	If `x` cannot be parsed as integer, the result is `null`.
+	If `x` starts with a hexadecimal prefix which is not followed by at least one valid hexadecimal
+	digit, the result is unspecified.
 	*/
 	static parseInt(x: string): null | number
 }

package/bin/Std.js

@@ -36,41 +36,29 @@ class Std {
 	
 	Leading whitespaces are ignored.
 	
-	If `x` starts with 0x or 0X, hexadecimal notation is recognized where the following digits may
-	contain 0-9 and A-F.
+	`x` may optionally start with a + or - to denote a postive or negative value respectively.
 	
-	Otherwise `x` is read as decimal number with 0-9 being allowed characters. `x` may also start with
-	a - to denote a negative value.
+	If the optional sign is followed 0x or 0X, hexadecimal notation is recognized where the following
+	digits may contain 0-9 and A-F. Both the prefix and digits are case insensitive.
 	
-	In decimal mode, parsing continues until an invalid character is detected, in which case the
-	result up to that point is returned. For hexadecimal notation, the effect of invalid characters
-	is unspecified.
+	Otherwise `x` is read as decimal number with 0-9 being allowed characters. Octal and binary
+	notations are not supported.
+	
+	Parsing continues until an invalid character is detected, in which case the result up to
+	that point is returned. Scientific notation is not supported. That is `Std.parseInt('10e2')` produces `10`.
 	
-	Leading 0s that are not part of the 0x/0X hexadecimal notation are ignored, which means octal
-	notation is not supported.
+	If `x` is `null`, the result is `null`.
+	If `x` cannot be parsed as integer or is empty, the result is `null`.
 	
-	If `x` is null, the result is unspecified.
-	If `x` cannot be parsed as integer, the result is `null`.
+	If `x` starts with a hexadecimal prefix which is not followed by at least one valid hexadecimal
+	digit, the result is unspecified.
 	*/
 	static parseInt(x) {
-		if (x != null) {
-			var _g = 0;
-			var _g1 = x.length;
-			while (_g < _g1) {
-				var i = _g++;
-				var c = x.charCodeAt(i);
-				if (c <= 8 || c >= 14 && c != 32 && c != 45) {
-					var nc = x.charCodeAt(i + 1);
-					var v = parseInt(x, (nc == 120 || nc == 88) ? 16 : 10);
-					if ((isNaN)(v)) {
-						return null;
-					} else {
-						return v;
-					};
-				};
-			};
+		var v = parseInt(x);
+		if ((isNaN)(v)) {
+			return null;
 		};
-		return null;
+		return v;
 	}
 	static get __name__() {
 		return "Std"
@@ -82,7 +70,7 @@ class Std {
 
 
 ;{
-	String.prototype.__class__ = String;
+	Object.defineProperty(String.prototype, "__class__", {"value": String, "enumerable": false, "writable": true});
 	String.__name__ = "String";
 	Array.__name__ = "Array";
 	Date.prototype.__class__ = Date;

package/bin/genes/Register.d.ts

@@ -11,5 +11,5 @@ export declare class Register {
 	static extend(superClass: any): void
 	static inherits(resolve: any, defer?: boolean): void
 	protected static fid: number
-	static bind(o: any, m: any): any
+	static bind(o: any, m: any): null | null | any
 }

package/bin/haxe/Constraints.js

@@ -2,4 +2,5 @@ import {Register} from "../genes/Register.js"
 
 const $global = Register.$global
 
-export const IMap = {}
+export const IMap = function() {};
+IMap.__isInterface__ = true;

package/bin/haxe/io/BytesBuffer.js

@@ -27,7 +27,8 @@ class BytesBuffer extends Register.inherits() {
 		if (this.size == 0) {
 			return;
 		};
-		this.u8.set(new Uint8Array(src.b.buffer, src.b.byteOffset + pos, len), this.pos);
+		var sub = new Uint8Array(src.b.buffer, src.b.byteOffset + pos, len);
+		this.u8.set(sub, this.pos);
 		this.pos += len;
 	}
 	grow(delta) {

package/bin/haxe/macro/Expr.d.ts

@@ -72,6 +72,10 @@ export type Var = {
 	*/
 	isFinal?: null | boolean, 
 	/**
+	Whether or not the variable is static.
+	*/
+	isStatic?: null | boolean, 
+	/**
 	Metadata associatied with the variable, if available.
 	*/
 	meta?: null | MetadataEntry[], 
@@ -154,6 +158,10 @@ export type TypeParamDecl = {
 	*/
 	constraints?: null | ComplexType[], 
 	/**
+	The optional default type of the type parameter.
+	*/
+	defaultType?: null | ComplexType, 
+	/**
 	The metadata of the type parameter.
 	*/
 	meta?: null | MetadataEntry[], 

package/bin/haxe/macro/Type.d.ts

@@ -31,6 +31,10 @@ export type AnonType = {
 Represents the declaration of type parameters.
 */
 export type TypeParameter = {
+	/**
+	The default type for this type parameter.
+	*/
+	defaultType?: null | Type, 
 	/**
 	The name of the type parameter.
 	*/

package/bin/haxe/zip/Compress.js

@@ -9,7 +9,8 @@ export const Compress = Register.global("$hxClasses")["haxe.zip.Compress"] =
 class Compress {
 	static run(s, level) {
 		var data = s.b;
-		return Helper.bytesOfBuffer(Zlib.deflateSync(Buffer.from(data.buffer, data.byteOffset, s.length), {"level": level}));
+		var buffer = Zlib.deflateSync(Buffer.from(data.buffer, data.byteOffset, s.length), {"level": level});
+		return Helper.bytesOfBuffer(buffer);
 	}
 	static get __name__() {
 		return "haxe.zip.Compress"

package/bin/js/Boot.d.ts

@@ -1,10 +1,10 @@
 
 export declare class Boot {
 	protected static getClass(o: null | any): null | any
-	protected static __string_rec(o: {
+	protected static __string_rec(o: null | {
 		__enum__: boolean, 
 		_hx_index: number, 
-		hasOwnProperty: (arg0: string) => boolean, 
+		hasOwnProperty: null | ((arg0: string) => boolean), 
 		length: number, 
 		toString: () => string
 	}, s: string): string

package/bin/js/lib/ArrayBuffer.d.ts

@@ -1,4 +1,4 @@
 
 export declare class ArrayBufferCompat {
-	protected static sliceImpl(begin: null | number, end?: null | number): ArrayBuffer
+	protected static sliceImpl(begin: null | number, end?: null | null | null | number): ArrayBuffer
 }

package/bin/js/lib/Promise.d.ts

@@ -3,8 +3,8 @@ export type ThenableStruct<T> = {
 	then: <TOut>(onFulfilled: null | ((arg0: T) => any), onRejected?: ((arg0: any) => any)) => ThenableStruct<TOut>
 }
 
-export type PromiseSettleOutcome = {
+export type PromiseSettleOutcome<T> = {
 	reason?: null | any, 
 	status: string, 
-	value?: null | any
+	value?: null | T
 }

package/bin/js/node/Fs.d.ts

@@ -49,13 +49,7 @@ export type FsWriteFileOptions = {
 }
 
 /**
-Defaults:
-{ flags: 'r',
-encoding: null,
-fd: null,
-mode: 0666,
-autoClose: true
-}
+Options for `Fs.createReadStream`.
 */
 export type FsCreateReadStreamOptions = {
 	/**

package/bin/js/node/Process.d.ts

@@ -4,3 +4,11 @@ export type MemoryUsage = {
 	heapUsed: number, 
 	rss: number
 }
+
+export type Release = {
+	headersUrl?: null | string, 
+	libUrl?: null | string, 
+	lts?: null | string, 
+	name: string, 
+	sourceUrl?: null | string
+}

package/bin/whet/Log.js

@@ -42,10 +42,10 @@ class Log {
 					};
 				} else {
 					var obj = arg;
-					var _g1_keys = Reflect__1.fields(obj);
-					var _g1_index = 0;
-					while (_g1_index < _g1_keys.length) {
-						var key = _g1_keys[_g1_index++];
+					var _g_keys = Reflect__1.fields(obj);
+					var _g_index = 0;
+					while (_g_index < _g_keys.length) {
+						var key = _g_keys[_g_index++];
 						out[key] = obj[key];
 					};
 				};

package/bin/whet/Project.js

@@ -13,8 +13,7 @@ class Project extends Register.inherits() {
 	new(config) {
 		this.stones = [];
 		this.cache = null;
-		var this1 = ["Instantiating new Project."];
-		Log.log(20, ...this1);
+		Log.log(20, ...["Instantiating new Project."]);
 		if (config == null || config.name == null) {
 			throw new Error("Must supply config and a name.");
 		};
@@ -49,8 +48,7 @@ class Project extends Register.inherits() {
 		};
 		this.cache = (config.cache == null) ? new CacheManager(this) : config.cache;
 		Project.projects.push(this);
-		var this1 = ["New project created.", {"project": this, "projectCount": Project.projects.length}];
-		Log.log(30, ...this1);
+		Log.log(30, ...["New project created.", {"project": this, "projectCount": Project.projects.length}]);
 	}
 	addCommand(name, stone) {
 		var cmd = new Command(name);

package/bin/whet/Source.js

@@ -119,7 +119,7 @@ class SourceData extends Register.inherits() {
 		return new Promise(function (res, rej) {
 			Fs.readFile(path, function (err, buffer) {
 				if (err != null) {
-					Log.log(50, ...["File does not exist.", {"id": id, "path": path}]);
+					Log.log(50, ...["File does not exist.", {"id": id, "path": path, "error": err}]);
 					rej(err);
 				} else {
 					var source = SourceData.fromBytes(id, buffer);

package/bin/whet/SourceHash.js

@@ -112,8 +112,7 @@ class SourceHash extends Register.inherits() {
 					_g.push(x1);
 				};
 			};
-			var this1 = _g;
-			return SourceHash.merge(...this1);
+			return SourceHash.merge(..._g);
 		});
 	}
 	static fromBytes(data) {
@@ -163,4 +162,8 @@ class SourceHash extends Register.inherits() {
 }
 
 
-SourceHash.EMPTY = new SourceHash(Buffer.alloc(32))
+SourceHash.EMPTY = (function($this) {var $r0
+	var bytes = Buffer.alloc(32);
+	
+	$r0 = new SourceHash(bytes)
+	return $r0})(this)

package/bin/whet/SourceId.d.ts

@@ -17,6 +17,7 @@ export declare class IdUtils {
 	static getDir(id: string): string
 	static setDir(id: string, dir: string): string
 	static fromCwdPath(s: string, root: string): string
+	static normalize(str: string): string
 }
 
 export declare class RootDir {

package/bin/whet/SourceId.js

@@ -110,6 +110,13 @@ class IdUtils {
 		var rootStr = Path.posix.resolve(root);
 		return Path.posix.relative(rootStr, absPath1);
 	}
+	static normalize(str) {
+		if (str.length > 0) {
+			str = Path.posix.normalize(str);
+			str = StringTools.replace(str, "\\", "/");
+		};
+		return str;
+	}
 	static get __name__() {
 		return "whet.IdUtils"
 	}

package/bin/whet/Utils.js

@@ -21,8 +21,7 @@ class Utils {
 		return unique;
 	}
 	static ensureDirExist(dir) {
-		var this1 = ["Ensuring directory " + dir + " exists."];
-		Log.log(10, ...this1);
+		Log.log(10, ...["Ensuring directory " + dir + " exists."]);
 		return new Promise(function (res, rej) {
 			Fs.stat(dir, function (err, stats) {
 				if (err != null) {

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.23", "-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.25", "-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) {
@@ -47,7 +47,8 @@ class Whet_Fields_ {
 			Log.log(30, ...["Loading project.", {"file": options.project}]);
 			var path = Url.pathToFileURL(options.project).href;
 			Log.log(20, ...["Resolved project path.", {"path": path}]);
-			import(path).then(function (module) {
+			var projectProm = import(path);
+			projectProm.then(function (module) {
 				Log.log(10, ...["Project module imported."]);
 				Whet_Fields_.initProjects();
 			})["catch"](function (e) {
@@ -123,14 +124,11 @@ class Whet_Fields_ {
 		var commands = [];
 		var from = 0;
 		var to;
-		while (true) {
+		do {
 			to = args.indexOf("+", from);
 			commands.push((to < 0) ? args.slice(from) : args.slice(from, to));
 			from = to + 1;
-			if (!(to >= 0)) {
-				break;
-			};
-		};
+		} while (to >= 0);
 		return commands;
 	}
 	static get __name__() {

package/bin/whet/cache/BaseCache.js

@@ -62,7 +62,7 @@ class BaseCache extends Register.inherits() {
 						_gthis.setRecentUseOrder(values, value);
 					};
 				};
-				return ((value != null) ? _gthis.source(stone, value) : Promise.resolve(null)).then(function (src) {
+				var srcPromise = ((value != null) ? _gthis.source(stone, value) : Promise.resolve(null)).then(function (src) {
 					if (src == null) {
 						Log.log(10, ...["Not cached.", {"stone": stone, "cache": _gthis}]);
 						return ((value != null) ? _gthis.remove(stone, value) : Promise.resolve(null)).then(function (_) {
@@ -83,7 +83,8 @@ class BaseCache extends Register.inherits() {
 						Log.log(10, ...["Found in cache", {"stone": stone, "cache": _gthis}]);
 						return Promise.resolve(src);
 					};
-				}).then(function (src) {
+				});
+				return srcPromise.then(function (src) {
 					if ((check == null) ? true : check._hx_index == 0) {
 						_gthis.checkDurability(stone, values, durability, function (v) {
 							return values.indexOf(v);

package/bin/whet/cache/Cache.js

@@ -2,7 +2,8 @@ import {Register} from "../../genes/Register.js"
 
 const $global = Register.$global
 
-export const Cache = {}
+export const Cache = function() {};
+Cache.__isInterface__ = true;
 
 export const CacheStrategy = 
 Register.global("$hxEnums")["whet.cache.CacheStrategy"] = 

package/bin/whet/cache/FileCache.js

@@ -25,12 +25,12 @@ class FileCache extends Register.inherits(BaseCache) {
 			var _g_index = 0;
 			while (_g_index < _g_keys.length) {
 				var key = _g_keys[_g_index++];
-				var _g1_value = db[key];
+				var _g_value = db[key];
 				var this1 = this.cache;
 				var _g = [];
 				var _g1 = 0;
-				while (_g1 < _g1_value.length) {
-					var val = _g1_value[_g1];
+				while (_g1 < _g_value.length) {
+					var val = _g_value[_g1];
 					++_g1;
 					var tmp = SourceHash.fromHex(val.hash);
 					var val1 = val.ctime;
@@ -224,11 +224,11 @@ class FileCache extends Register.inherits(BaseCache) {
 			var _g_keys = this1.keys();
 			while (_g_keys.hasNext()) {
 				var key = _g_keys.next();
-				var _g1_value = this1.get(key);
+				var _g_value = this1.get(key);
 				var _g = [];
 				var _g1 = 0;
-				while (_g1 < _g1_value.length) {
-					var val = _g1_value[_g1];
+				while (_g1 < _g_value.length) {
+					var val = _g_value[_g1];
 					++_g1;
 					var tmp = SourceHash.toHex(val.hash);
 					var val1 = val.ctime;

package/bin/whet/route/Router.js

@@ -281,11 +281,14 @@ class Filters {
 		};
 		var _g = 0;
 		var _g1 = f.filter.set;
-		while (_g < _g1.length) if (f.filter.matchOne(f.pathSoFar, _g1[_g++], true)) {
-			if (f.filter.options.flipNegate) {
-				return true;
-			} else {
-				return true != f.filter.negate;
+		while (_g < _g1.length) {
+			var hit = f.filter.matchOne(f.pathSoFar, _g1[_g++], true);
+			if (hit) {
+				if (f.filter.options.flipNegate) {
+					return true;
+				} else {
+					return true != f.filter.negate;
+				};
 			};
 		};
 		if (f.filter.options.flipNegate) {

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

@@ -10,6 +10,7 @@ export declare class RemoteFile extends Stone<RemoteFileConfig> {
 	constructor(config: RemoteFileConfig)
 	protected initConfig(): void
 	protected generate(hash: SourceHash): Promise<SourceData[]>
+	protected get(url: string, res: ((arg0: SourceData[]) => void), rej: ((reason: any) => void)): void
 	list(): Promise<string[]>
 	generateHash(): Promise<SourceHash>
 	protected getId(): string

package/bin/whet/stones/RemoteFile.js

@@ -25,19 +25,27 @@ class RemoteFile extends Register.inherits(Stone) {
 		var _gthis = this;
 		Log.log(30, ...["Downloading file.", {"url": this.config.url}]);
 		return new Promise(function (res, rej) {
-			Https.get(_gthis.config.url, function (response) {
-				if (response.statusCode < 200 || response.statusCode >= 300) {
-					response.resume();
-					throw new Error("Error downloading file. " + response.statusCode + " – " + response.statusMessage);
-				};
-				var bufs = [];
-				response.on("data", function (d) {
-					return bufs.push(d);
-				});
-				response.on("end", function () {
-					var data = Buffer.concat(bufs);
-					res([SourceData.fromBytes(_gthis.getId(), data)]);
-				});
+			_gthis.get(_gthis.config.url, res, rej);
+		});
+	}
+	get(url, res, rej) {
+		var _gthis = this;
+		Https.get(url, function (response) {
+			if (response.statusCode == 301 || response.statusCode == 302) {
+				_gthis.get(response.headers["location"], res, rej);
+				return;
+			};
+			if (response.statusCode < 200 || response.statusCode >= 300) {
+				response.resume();
+				throw new Error("Error downloading file. " + response.statusCode + " – " + response.statusMessage);
+			};
+			var bufs = [];
+			response.on("data", function (d) {
+				return bufs.push(d);
+			});
+			response.on("end", function () {
+				var data = Buffer.concat(bufs);
+				res([SourceData.fromBytes(_gthis.getId(), data)]);
 			});
 		});
 	}

package/bin/whet/stones/Server.js

@@ -31,7 +31,17 @@ class Server extends Register.inherits(Stone) {
 	*/
 	serve() {
 		var _gthis = this;
-		Http.createServer(Register.bind(this, this.handler)).listen(this.config.port, function () {
+		var server = Http.createServer(Register.bind(this, this.handler));
+		var nextRetry = 500;
+		server.on("error", function (err) {
+			Log.log(50, ...["Failed to open a server. Retrying in " + nextRetry + "ms.", {"error": err}]);
+			global.setTimeout(function () {
+				server.listen(_gthis.config.port);
+			}, nextRetry);
+			nextRetry *= 2;
+			return nextRetry;
+		});
+		server.listen(this.config.port, function () {
 			Log.log(30, ...["Started web server.", {"port": _gthis.config.port}]);
 		});
 	}
@@ -69,7 +79,8 @@ class Server extends Register.inherits(Stone) {
 					id = "" + id + "/index.html";
 				};
 				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) {
+					var 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();

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

@@ -10,6 +10,10 @@ import {Project} from "../Project"
 export declare class ZipStone extends Stone<ZipConfig> {
 	constructor(config: ZipConfig)
 	protected initConfig(): void
+	
+	/**
+	Keep last used 5 for a day and last used 1 indefinitely.
+	*/
 	protected generateHash(): Promise<SourceHash>
 	protected generate(hash: SourceHash): Promise<SourceData[]>
 	list(): Promise<string[]>

package/bin/whet/stones/Zip.js

@@ -31,6 +31,10 @@ class ZipStone extends Register.inherits(Stone) {
 			this.config.cacheStrategy = CacheStrategy.InFile(CacheDurability.Any([CacheDurability.LimitCountByLastUse(1), CacheDurability.All([CacheDurability.MaxAge(86400), CacheDurability.LimitCountByLastUse(5)])]), DurabilityCheck.AllOnUse);
 		};
 	}
+	
+	/**
+	Keep last used 5 for a day and last used 1 indefinitely.
+	*/
 	generateHash() {
 		var _gthis = this;
 		return this.config.sources.getHash().then(function (hash) {

package/package.json

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