whet 0.0.26 → 0.0.28

package/bin/js/node/buffer/Buffer.js

@@ -6,7 +6,7 @@ const $global = Register.$global
 export const Helper = Register.global("$hxClasses")["js.node.buffer._Buffer.Helper"] = 
 class Helper {
 	static bytesOfBuffer(b) {
-		var o = Object.create(Bytes.prototype);
+		let o = Object.create(Bytes.prototype);
 		o.length = b.byteLength;
 		o.b = b;
 		b.bufferValue = b;

package/bin/whet/Log.js

@@ -25,10 +25,10 @@ class Log {
 	}
 	static log(level, ...args) {
 		if (level >= Log.logLevel) {
-			var out = {"level": level, "time": Date.now(), "msg": null};
-			var _g_current = 0;
+			let out = {"level": level, "time": Date.now(), "msg": null};
+			let _g_current = 0;
 			while (_g_current < args.length) {
-				var arg = args[_g_current++];
+				let arg = args[_g_current++];
 				if (arg == null) {
 					continue;
 				};
@@ -41,11 +41,11 @@ class Log {
 						out["msg"].push(arg);
 					};
 				} else {
-					var obj = arg;
-					var _g_keys = Reflect__1.fields(obj);
-					var _g_index = 0;
+					let obj = arg;
+					let _g_keys = Reflect__1.fields(obj);
+					let _g_index = 0;
 					while (_g_index < _g_keys.length) {
-						var key = _g_keys[_g_index++];
+						let key = _g_keys[_g_index++];
 						out[key] = obj[key];
 					};
 				};

package/bin/whet/Project.js

@@ -27,21 +27,21 @@ class Project extends Register.inherits() {
 		this.options = (config.options == null) ? [] : config.options;
 		this.onInit = config.onInit;
 		if (config.rootDir == null) {
-			var oldValue = Error.prepareStackTrace;
+			let oldValue = Error.prepareStackTrace;
 			Error.prepareStackTrace = function (_, stack) {
 				return stack;
 			};
-			var file = new Error().stack[3].getFileName();
+			let file = new Error().stack[3].getFileName();
 			Error.prepareStackTrace = oldValue;
 			file = decodeURI(file);
 			file = StringTools.replace(file, "file:///", "");
-			var str = Path.relative(process.cwd(), file);
+			let str = Path.relative(process.cwd(), file);
 			if (str.length > 0) {
 				str = Path.posix.normalize(str);
 				str = StringTools.replace(str, "\\", "/");
 			};
-			var id = str;
-			var dir = id.substring(0, id.lastIndexOf("/") + 1);
+			let id = str;
+			let dir = id.substring(0, id.lastIndexOf("/") + 1);
 			this.rootDir = (dir.length == 0) ? "./" : dir;
 		} else {
 			this.rootDir = config.rootDir;
@@ -51,7 +51,7 @@ class Project extends Register.inherits() {
 		Log.log(30, ...["New project created.", {"project": this, "projectCount": Project.projects.length}]);
 	}
 	addCommand(name, stone) {
-		var cmd = new Command(name);
+		let cmd = new Command(name);
 		if (stone != null) {
 			cmd.alias(stone.id + "." + cmd.name());
 		};

package/bin/whet/Source.js

@@ -19,7 +19,7 @@ class Source extends Register.inherits() {
 		this.hash = hash;
 		this.origin = origin;
 		this.ctime = ctime;
-		var _g = 0;
+		let _g = 0;
 		while (_g < data.length) data[_g++].source = this;
 	}
 	tryDirPath() {
@@ -44,7 +44,7 @@ class Source extends Register.inherits() {
 		if (pattern == null) {
 			return this.data[0];
 		} else {
-			var filter = MinimatchType_Fields_.makeMinimatch(pattern);
+			let filter = MinimatchType_Fields_.makeMinimatch(pattern);
 			return Lambda.find(this.data, function (entry) {
 				return filter.match(entry.id);
 			});
@@ -73,7 +73,7 @@ class SourceData extends Register.inherits() {
 	Same as `getFilePath` but relative to project, not CWD.
 	*/
 	getFilePathId(idOverride) {
-		var _gthis = this;
+		let _gthis = this;
 		if (this.filePathId == null) {
 			return this.getFilePath(idOverride).then(function (_) {
 				return _gthis.filePathId;
@@ -89,13 +89,13 @@ class SourceData extends Register.inherits() {
 	* @param [idOverride] Use to change the name/directory of the file. Ignored if source already has a filepath.
 	*/
 	getFilePath(idOverride) {
-		var _gthis = this;
+		let _gthis = this;
 		if (this.filePath == null) {
 			if (this.source == null) {
 				new Error("Data without source.");
 			};
-			var dir = this.source.getDirPath();
-			var name = (idOverride != null && !(idOverride.length == 0 || idOverride.charCodeAt(idOverride.length - 1) == 47)) ? idOverride : this.id;
+			let dir = this.source.getDirPath();
+			let name = (idOverride != null && !(idOverride.length == 0 || idOverride.charCodeAt(idOverride.length - 1) == 47)) ? idOverride : this.id;
 			if (!(dir.length == 0 || dir.charCodeAt(dir.length - 1) == 47)) {
 				throw new Error("\"" + dir + "\" is not a directory.");
 			};
@@ -122,7 +122,7 @@ class SourceData extends Register.inherits() {
 					Log.log(50, ...["File does not exist.", {"id": id, "path": path, "error": err}]);
 					rej(err);
 				} else {
-					var source = SourceData.fromBytes(id, buffer);
+					let source = SourceData.fromBytes(id, buffer);
 					source.filePath = path;
 					source.filePathId = pathId;
 					res(source);

package/bin/whet/SourceHash.js

@@ -13,7 +13,7 @@ class SourceHash extends Register.inherits() {
 		this.bytes = bytes;
 	}
 	add(hash) {
-		var data = Buffer.alloc(64);
+		let data = Buffer.alloc(64);
 		this.bytes.copy(data, 0, 0, 32);
 		hash.bytes.copy(data, 32, 0, 32);
 		return SourceHash.fromBytes(data);
@@ -40,60 +40,54 @@ class SourceHash extends Register.inherits() {
 		if (recursive == null) {
 			recursive = true;
 		};
-		var _g = [];
-		var _g1 = 0;
-		var _g2 = MaybeArray_Fields_.makeArray(paths);
+		let _g = [];
+		let _g1 = 0;
+		let _g2 = MaybeArray_Fields_.makeArray(paths);
 		while (_g1 < _g2.length) {
-			var src = [_g2[_g1]];
+			let src = _g2[_g1];
 			++_g1;
-			_g.push(new Promise((function (src) {
-				return function (res, rej) {
-					Fs.stat(src[0], (function (src) {
-						return function (err, stats) {
-							if (err != null) {
-								rej(err);
-							} else if (stats.isDirectory()) {
-								Utils.listDirectoryFiles(src[0], recursive).then((function () {
-									return function (files) {
-										res(files);
-									};
-								})());
-							} else {
-								res([src[0]]);
-							};
-						};
-					})(src));
-				};
-			})(src)));
+			_g.push(new Promise(function (res, rej) {
+				Fs.stat(src, function (err, stats) {
+					if (err != null) {
+						rej(err);
+					} else if (stats.isDirectory()) {
+						Utils.listDirectoryFiles(src, recursive).then(function (files) {
+							res(files);
+						});
+					} else {
+						res([src]);
+					};
+				});
+			}));
 		};
-		var allFilesProm = _g;
+		let allFilesProm = _g;
 		return Promise.all(allFilesProm).then(function (arrFiles) {
-			var result = new Array(arrFiles.length);
-			var _g = 0;
-			var _g1 = arrFiles.length;
+			let result = new Array(arrFiles.length);
+			let _g = 0;
+			let _g1 = arrFiles.length;
 			while (_g < _g1) {
-				var i = _g++;
-				var files = arrFiles[i];
+				let i = _g++;
+				let files = arrFiles[i];
 				if (filter != null) {
-					var _g2 = [];
-					var _g3 = 0;
-					var _g4 = files;
-					while (_g3 < _g4.length) {
-						var v = _g4[_g3];
-						++_g3;
+					let _g = [];
+					let _g1 = 0;
+					let _g2 = files;
+					while (_g1 < _g2.length) {
+						let v = _g2[_g1];
+						++_g1;
 						if (filter(v)) {
-							_g2.push(v);
+							_g.push(v);
 						};
 					};
-					files = _g2;
+					files = _g;
 				};
 				files.sort();
-				var result1 = new Array(files.length);
-				var _g5 = 0;
-				var _g6 = files.length;
-				while (_g5 < _g6) {
-					var i1 = _g5++;
-					result1[i1] = SourceHash.fromFile(files[i1]);
+				let result1 = new Array(files.length);
+				let _g1 = 0;
+				let _g2 = files.length;
+				while (_g1 < _g2) {
+					let i = _g1++;
+					result1[i] = SourceHash.fromFile(files[i]);
 				};
 				result[i] = Promise.all(result1);
 			};
@@ -101,14 +95,14 @@ class SourceHash extends Register.inherits() {
 		}).then(function (proms) {
 			return Promise.all(proms);
 		}).then(function (allHashes) {
-			var _g = [];
-			var _g_current = 0;
-			var _g_array = allHashes;
+			let _g = [];
+			let _g_current = 0;
+			let _g_array = allHashes;
 			while (_g_current < _g_array.length) {
-				var e = _g_array[_g_current++];
-				var x = Register.iter(e);
+				let e = _g_array[_g_current++];
+				let x = Register.getIterator(e);
 				while (x.hasNext()) {
-					var x1 = x.next();
+					let x1 = x.next();
 					_g.push(x1);
 				};
 			};
@@ -136,7 +130,7 @@ class SourceHash extends Register.inherits() {
 		};
 	}
 	static fromHex(hex) {
-		var hash = Buffer.from(hex, "hex");
+		let hash = Buffer.from(hex, "hex");
 		if (hash.length != 32) {
 			return null;
 		} else {
@@ -147,9 +141,9 @@ class SourceHash extends Register.inherits() {
 		if (hash.length == 0) {
 			return SourceHash.EMPTY;
 		};
-		var h = hash[0];
-		var _g = 1;
-		var _g1 = hash.length;
+		let h = hash[0];
+		let _g = 1;
+		let _g1 = hash.length;
 		while (_g < _g1) h = h.add(hash[_g++]);
 		return h;
 	}
@@ -163,7 +157,7 @@ class SourceHash extends Register.inherits() {
 
 
 SourceHash.EMPTY = (function($this) {var $r0
-	var bytes = Buffer.alloc(32);
+	let bytes = Buffer.alloc(32);
 	
 	$r0 = new SourceHash(bytes)
 	return $r0})(this)

package/bin/whet/SourceId.js

@@ -24,10 +24,10 @@ class IdUtils {
 			throw new Error("\"" + directory + "\" is not a directory.");
 		};
 		if (nested) {
-			var dir = id.substring(0, id.lastIndexOf("/") + 1);
+			let dir = id.substring(0, id.lastIndexOf("/") + 1);
 			return ((dir.length == 0) ? "./" : dir).indexOf(directory) == 0;
 		} else {
-			var dir = id.substring(0, id.lastIndexOf("/") + 1);
+			let dir = id.substring(0, id.lastIndexOf("/") + 1);
 			return ((dir.length == 0) ? "./" : dir) == directory;
 		};
 	}
@@ -35,8 +35,8 @@ class IdUtils {
 		if (!(directory.length == 0 || directory.charCodeAt(directory.length - 1) == 47)) {
 			throw new Error("\"" + directory + "\" is not a directory.");
 		};
-		var tmp;
-		var dir = id.substring(0, id.lastIndexOf("/") + 1);
+		let tmp;
+		let dir = id.substring(0, id.lastIndexOf("/") + 1);
 		tmp = ((dir.length == 0) ? "./" : dir).indexOf(directory) == 0;
 		if (tmp) {
 			return id.substring(directory.length);
@@ -68,7 +68,7 @@ class IdUtils {
 		return id.substring(id.lastIndexOf("/") + 1);
 	}
 	static setWithExt(id, name) {
-		var dir = id.substring(0, id.lastIndexOf("/") + 1);
+		let dir = id.substring(0, id.lastIndexOf("/") + 1);
 		return Path.posix.join((dir.length == 0) ? "./" : dir, name);
 	}
 	static getExt(id) {
@@ -78,18 +78,18 @@ class IdUtils {
 		if (ext.length > 0 && ext.charCodeAt(0) != 46) {
 			ext = "." + ext;
 		};
-		var dir = id.substring(0, id.lastIndexOf("/") + 1);
+		let dir = id.substring(0, id.lastIndexOf("/") + 1);
 		return Path.posix.join((dir.length == 0) ? "./" : dir, Path.posix.parse(id).name) + ext;
 	}
 	static getWithoutExt(id) {
 		return Path.posix.parse(id).name;
 	}
 	static setWithoutExt(id, name) {
-		var dir = id.substring(0, id.lastIndexOf("/") + 1);
+		let dir = id.substring(0, id.lastIndexOf("/") + 1);
 		return Path.posix.join((dir.length == 0) ? "./" : dir, name) + Path.posix.extname(id);
 	}
 	static getDir(id) {
-		var dir = id.substring(0, id.lastIndexOf("/") + 1);
+		let dir = id.substring(0, id.lastIndexOf("/") + 1);
 		if (dir.length == 0) {
 			return "./";
 		} else {
@@ -100,14 +100,14 @@ class IdUtils {
 		return Path.posix.join(dir, id.substring(id.lastIndexOf("/") + 1));
 	}
 	static fromCwdPath(s, root) {
-		var absPath = Path.posix;
-		var str = s;
+		let absPath = Path.posix;
+		let str = s;
 		if (str.length > 0) {
 			str = Path.posix.normalize(str);
 			str = StringTools.replace(str, "\\", "/");
 		};
-		var absPath1 = absPath.resolve(str);
-		var rootStr = Path.posix.resolve(root);
+		let absPath1 = absPath.resolve(str);
+		let rootStr = Path.posix.resolve(root);
 		return Path.posix.relative(rootStr, absPath1);
 	}
 	static normalize(str) {

package/bin/whet/Stone.js

@@ -53,13 +53,13 @@ class Stone extends Register.inherits() {
 	* Locks this stone for generating. Used to prevent parallel generation of the same sources.
 	*/
 	acquire(run) {
-		var _gthis = this;
 		Log.log(10, ...["Acquiring lock on a stone.", {"stone": this}]);
+		let _gthis = this;
 		if (this.locked) {
 			Log.log(20, ...["Stone is locked, waiting.", {"stone": this}]);
-			var deferredRes;
-			var deferredRej;
-			var deferred = new Promise(function (res, rej) {
+			let deferredRes;
+			let deferredRej;
+			let deferred = new Promise(function (res, rej) {
 				deferredRes = res;
 				deferredRej = rej;
 			});
@@ -67,11 +67,11 @@ class Stone extends Register.inherits() {
 			return deferred;
 		} else {
 			this.locked = true;
-			var runNext = null;
+			let runNext = null;
 			runNext = function () {
 				if (_gthis.lockQueue.length > 0) {
 					Log.log(20, ...["Running next queued-up lock acquire function.", {"stone": _gthis}]);
-					var queued = _gthis.lockQueue.shift();
+					let queued = _gthis.lockQueue.shift();
 					queued.run().then(queued.res)["catch"](queued.rej)["finally"](runNext);
 				} else {
 					_gthis.locked = false;
@@ -97,8 +97,8 @@ class Stone extends Register.inherits() {
 	* Hashes of dependency stones (see `config.dependencies`) will be added to the hash.
 	*/
 	getHash() {
-		var _gthis = this;
 		Log.log(20, ...["Generating hash.", {"stone": this}]);
+		let _gthis = this;
 		return this.finalMaybeHash().then(function (hash) {
 			if (hash != null) {
 				return hash;
@@ -120,9 +120,9 @@ class Stone extends Register.inherits() {
 		if (hash == null || this.config.dependencies == null) {
 			return Promise.resolve(hash);
 		} else {
-			var _g = [];
-			var _g1 = 0;
-			var _g2 = MaybeArray_Fields_.makeArray(this.config.dependencies);
+			let _g = [];
+			let _g1 = 0;
+			let _g2 = MaybeArray_Fields_.makeArray(this.config.dependencies);
 			while (_g1 < _g2.length) _g.push(_g2[_g1++].getHash());
 			return Promise.all(_g).then(function (hashes) {
 				return hash.add(SourceHash.merge(...hashes));
@@ -136,35 +136,35 @@ class Stone extends Register.inherits() {
 	* Hash passed should be the same as is this stone's current one. Passed in as optimization.
 	*/
 	generateSource(hash) {
-		var _gthis = this;
 		if (!this.locked) {
 			throw new Error("Acquire a lock before generating.");
 		};
 		Log.log(20, ...["Generating source.", {"stone": this, "hash": hash}]);
-		var init;
+		let init;
 		if (this.config.dependencies != null) {
-			var _g = [];
-			var _g1 = 0;
-			var _g2 = MaybeArray_Fields_.makeArray(this.config.dependencies);
+			let _g = [];
+			let _g1 = 0;
+			let _g2 = MaybeArray_Fields_.makeArray(this.config.dependencies);
 			while (_g1 < _g2.length) _g.push(_g2[_g1++].getSource());
 			init = Promise.all(_g);
 		} else {
 			init = Promise.resolve(null);
 		};
+		let _gthis = this;
 		return init.then(function (_) {
-			var dataPromise = _gthis.generate(hash);
+			let dataPromise = _gthis.generate(hash);
 			if (dataPromise != null) {
 				return dataPromise.then(function (data) {
-					var finalHash;
+					let finalHash;
 					if (hash != null) {
 						finalHash = Promise.resolve(hash);
 					} else {
-						var _gthis1 = _gthis;
-						var result = new Array(data.length);
-						var _g = 0;
-						var _g1 = data.length;
+						let _gthis1 = _gthis;
+						let result = new Array(data.length);
+						let _g = 0;
+						let _g1 = data.length;
 						while (_g < _g1) {
-							var i = _g++;
+							let i = _g++;
 							result[i] = SourceHash.fromBytes(data[i].data);
 						};
 						finalHash = _gthis1.finalizeHash(SourceHash.merge(...result));
@@ -179,11 +179,11 @@ class Stone extends Register.inherits() {
 		})["catch"](function (e) {
 			return _gthis.handleError(e).then(function (data) {
 				Log.log(40, ...["Error happened and was handled by `handleError`.", {"stone": _gthis, "error": e}]);
-				var result = new Array(data.length);
-				var _g = 0;
-				var _g1 = data.length;
+				let result = new Array(data.length);
+				let _g = 0;
+				let _g1 = data.length;
 				while (_g < _g1) {
-					var i = _g++;
+					let i = _g++;
 					result[i] = SourceHash.fromBytes(data[i].data);
 				};
 				return new Source(data, SourceHash.merge(...result), _gthis, Date.now() / 1000);
@@ -215,7 +215,7 @@ class Stone extends Register.inherits() {
 	* dependencies.
 	*/
 	finalMaybeHash() {
-		var _gthis = this;
+		let _gthis = this;
 		return this.generateHash().then(function (hash) {
 			return _gthis.finalizeHash(hash);
 		});
@@ -229,12 +229,12 @@ class Stone extends Register.inherits() {
 	*/
 	list() {
 		return this.getSource().then(function (source) {
-			var _this = source.data;
-			var result = new Array(_this.length);
-			var _g = 0;
-			var _g1 = _this.length;
+			let _this = source.data;
+			let result = new Array(_this.length);
+			let _g = 0;
+			let _g1 = _this.length;
 			while (_g < _g1) {
-				var i = _g++;
+				let i = _g++;
 				result[i] = _this[i].id;
 			};
 			return result;
@@ -267,22 +267,22 @@ class Stone extends Register.inherits() {
 	* Can be a directory or a file path (only if this resource generates single source).
 	*/
 	exportTo(path) {
-		var _gthis = this;
 		Log.log(30, ...["Exporting file(s).", {"path": path, "stone": this}]);
-		var isDir = path.length == 0 || path.charCodeAt(path.length - 1) == 47;
+		let isDir = path.length == 0 || path.charCodeAt(path.length - 1) == 47;
+		let _gthis = this;
 		return this.getSource().then(function (src) {
 			if (src.data.length > 1 && !isDir) {
 				throw new Error("Path is not a directory for multiple source export.");
 			};
-			var _g = [];
-			var _g1 = 0;
-			var _g2 = src.data;
+			let _g = [];
+			let _g1 = 0;
+			let _g2 = src.data;
 			while (_g1 < _g2.length) {
-				var data = _g2[_g1];
+				let data = _g2[_g1];
 				++_g1;
-				var id;
+				let id;
 				if (isDir) {
-					var id1 = data.id;
+					let id1 = data.id;
 					if (!(path.length == 0 || path.charCodeAt(path.length - 1) == 47)) {
 						throw new Error("\"" + path + "\" is not a directory.");
 					};

package/bin/whet/Utils.js

@@ -9,14 +9,14 @@ const $global = Register.$global
 export const Utils = Register.global("$hxClasses")["whet.Utils"] = 
 class Utils {
 	static makeUnique(val, isNotUnique, modify) {
-		var unique = val;
-		var counter = 0;
+		let unique = val;
+		let counter = 0;
 		while (isNotUnique(unique)) unique = modify(val, ++counter);
 		return unique;
 	}
 	static makeUniqueString(s, isNotUnique) {
-		var unique = s;
-		var counter = 0;
+		let unique = s;
+		let counter = 0;
 		while (isNotUnique(unique)) unique = s + ++counter;
 		return unique;
 	}
@@ -81,17 +81,17 @@ class Utils {
 			recursive = true;
 		};
 		return new Promise(function (res, rej) {
-			var result = [];
+			let result = [];
 			Fs.readdir(dir, { withFileTypes : true}, function(err,files) {
 	if(err != null) {
 		rej(err);
 	} else {
-		var otherDirs = [];
-		var _g = 0;
+		let otherDirs = [];
+		let _g = 0;
 		while(_g < files.length) {
-			var file = files[_g];
+			let file = files[_g];
 			++_g;
-			var path = Path.join(dir,file.name);
+			let path = Path.join(dir,file.name);
 			if(file.isDirectory()) {
 				if(recursive) {
 					otherDirs.push(Utils.listDirectoryFiles(path,true));
@@ -101,11 +101,11 @@ class Utils {
 			}
 		}
 		Promise.all(otherDirs).then(function(arr) {
-			var _g = 0;
+			let _g = 0;
 			while(_g < arr.length) {
-				var a = arr[_g];
+				let a = arr[_g];
 				++_g;
-				var _g1 = 0;
+				let _g1 = 0;
 				while(_g1 < a.length) result.push(a[_g1++]);
 			}
 			res(result);