whet 0.0.26 → 0.0.27

package/bin/whet/Whet.js

@@ -12,20 +12,20 @@ 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.26", "-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.27", "-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) {
-			var _g1 = Exception.caught(_g);
+			let _g1 = Exception.caught(_g);
 			if (((_g1.get_native()) instanceof CommanderError) && _g1.get_native().code == "commander.version") {
 				process.exit();
 			} else {
 				throw Exception.thrown(_g1);
 			};
 		};
-		var options = Whet_Fields_.program.opts();
+		let options = Whet_Fields_.program.opts();
 		if (options.logLevel != null) {
-			var n = Std.parseInt(options.logLevel);
+			let n = Std.parseInt(options.logLevel);
 			if (n == null) {
 				n = LogLevel.fromString(options.logLevel);
 			};
@@ -45,9 +45,9 @@ class Whet_Fields_ {
 			Whet_Fields_.initProjects();
 		} else {
 			Log.log(30, ...["Loading project.", {"file": options.project}]);
-			var path = Url.pathToFileURL(options.project).href;
+			let path = Url.pathToFileURL(options.project).href;
 			Log.log(20, ...["Resolved project path.", {"path": path}]);
-			var projectProm = import(path);
+			let projectProm = import(path);
 			projectProm.then(function (module) {
 				Log.log(10, ...["Project module imported."]);
 				Whet_Fields_.initProjects();
@@ -65,29 +65,29 @@ class Whet_Fields_ {
 	}
 	static initProjects() {
 		Log.log(10, ...["Parsing remaining arguments.", {"args": Whet_Fields_.program.args}]);
-		var _g = 0;
-		var _g1 = Project.projects;
+		let _g = 0;
+		let _g1 = Project.projects;
 		while (_g < _g1.length) {
-			var _g2 = 0;
-			var _g3 = _g1[_g++].options;
+			let _g2 = 0;
+			let _g3 = _g1[_g++].options;
 			while (_g2 < _g3.length) Whet_Fields_.program.addOption(_g3[_g2++]);
 		};
 		Whet_Fields_.program.allowUnknownOption(false);
-		var commands = Whet_Fields_.getCommands(Whet_Fields_.program.args);
-		var initProm;
+		let commands = Whet_Fields_.getCommands(Whet_Fields_.program.args);
+		let initProm;
 		if (commands.length > 0) {
-			var res = Whet_Fields_.program.parseOptions(commands[0]);
+			let res = Whet_Fields_.program.parseOptions(commands[0]);
 			commands[0] = res.operands.concat(res.unknown);
-			var promises = [];
-			var _g = 0;
-			var _g1 = Project.projects;
+			let promises = [];
+			let _g = 0;
+			let _g1 = Project.projects;
 			while (_g < _g1.length) {
-				var p = _g1[_g];
+				let p = _g1[_g];
 				++_g;
 				if (p.onInit != null) {
 					Log.log(10, ...["Initializing project.", {"project": p.id}]);
 					p.config = Whet_Fields_.program.opts();
-					var prom = p.onInit(p.config);
+					let prom = p.onInit(p.config);
 					if (prom != null) {
 						promises.push(prom);
 					};
@@ -97,12 +97,12 @@ class Whet_Fields_ {
 		} else {
 			initProm = Promise.resolve();
 		};
-		var nextCommand = null;
+		let nextCommand = null;
 		nextCommand = function () {
 			if (commands.length == 0) {
 				return;
 			};
-			var c = commands.shift();
+			let c = commands.shift();
 			Log.log(10, ...["Executing command.", {"commandArgs": c}]);
 			Whet_Fields_.program.parseAsync(c, {"from": "user"}).then(function (_) {
 				nextCommand();
@@ -122,9 +122,9 @@ class Whet_Fields_ {
 		return Whet_Fields_.program.parseAsync(cmd, {"from": "user"});
 	}
 	static getCommands(args) {
-		var commands = [];
-		var from = 0;
-		var to;
+		let commands = [];
+		let from = 0;
+		let to;
 		do {
 			to = args.indexOf("+", from);
 			commands.push((to < 0) ? args.slice(from) : args.slice(from, to));

package/bin/whet/cache/BaseCache.js

@@ -20,7 +20,7 @@ class BaseCache extends Register.inherits() {
 		this.cache = cache;
 	}
 	get(stone, durability, check) {
-		var _gthis = this;
+		let _gthis = this;
 		return stone.acquire(function () {
 			return stone.finalMaybeHash().then(function (hash) {
 				if (hash == null) {
@@ -35,10 +35,10 @@ class BaseCache extends Register.inherits() {
 					return Promise.resolve({"generatedSource": null, "hash": hash});
 				};
 			}).then(function (data) {
-				var generatedSource = data.generatedSource;
-				var hash = data.hash;
-				var values = _gthis.cache.get(_gthis.key(stone));
-				var ageCount = function (val) {
+				let generatedSource = data.generatedSource;
+				let hash = data.hash;
+				let values = _gthis.cache.get(_gthis.key(stone));
+				let ageCount = function (val) {
 					return Lambda.count(values, function (v) {
 						if (v != val) {
 							return v.ctime > val.ctime;
@@ -47,7 +47,7 @@ class BaseCache extends Register.inherits() {
 						};
 					});
 				};
-				var value = null;
+				let value = null;
 				if (values != null && values.length > 0) {
 					value = Lambda.find(values, function (v) {
 						return SourceHash.equals(v.hash, hash);
@@ -62,7 +62,7 @@ class BaseCache extends Register.inherits() {
 						_gthis.setRecentUseOrder(values, value);
 					};
 				};
-				var srcPromise = ((value != null) ? _gthis.source(stone, value) : Promise.resolve(null)).then(function (src) {
+				let 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 (_) {
@@ -96,38 +96,38 @@ class BaseCache extends Register.inherits() {
 		});
 	}
 	set(source) {
-		var _gthis = this;
 		Log.log(10, ...["Setting source in cache.", {"source": source}]);
-		var k = this.key(source.origin);
+		let k = this.key(source.origin);
 		if (!this.cache.exists(k)) {
 			this.cache.set(k, []);
 		};
+		let _gthis = this;
 		return this.value(source).then(function (val) {
 			_gthis.cache.get(k).unshift(val);
 			return val;
 		});
 	}
 	getUniqueDir(stone, baseDir, hash) {
-		var _gthis = this;
 		if (hash != null) {
-			var values = this.cache.get(this.key(stone));
+			let values = this.cache.get(this.key(stone));
 			if (values != null) {
-				var existingVal = Lambda.find(values, function (v) {
+				let existingVal = Lambda.find(values, function (v) {
 					return SourceHash.equals(v.hash, hash);
 				});
 				if (existingVal != null) {
-					var existingPath = this.getDirFor(existingVal);
+					let existingPath = this.getDirFor(existingVal);
 					if (existingPath != null) {
 						return existingPath;
 					};
 				};
 			};
 		};
-		var filenames = this.getExistingDirs(stone);
-		var maxNum = (filenames != null) ? Lambda.fold(filenames, function (fn, num) {
-			var dir = fn.substring(0, fn.lastIndexOf("/") + 1);
-			var parts = Path.posix.join(".", _gthis.rootDir, ".", (dir.length == 0) ? "./" : dir).split("/");
-			var name = (parts.length > 1) ? parts[parts.length - 2] : "";
+		let filenames = this.getExistingDirs(stone);
+		let _gthis = this;
+		let maxNum = (filenames != null) ? Lambda.fold(filenames, function (fn, num) {
+			let dir = fn.substring(0, fn.lastIndexOf("/") + 1);
+			let parts = Path.posix.join(".", _gthis.rootDir, ".", (dir.length == 0) ? "./" : dir).split("/");
+			let name = (parts.length > 1) ? parts[parts.length - 2] : "";
 			return Math.max(num, (name.charAt(0) == "v") ? Std.parseInt(HxOverrides.substr(name, 1, null)) : 0);
 		}, 0) : 0;
 		++maxNum;
@@ -141,13 +141,13 @@ class BaseCache extends Register.inherits() {
 		if (values == null || values.length == 0) {
 			return;
 		};
-		var i = values.length;
+		let i = values.length;
 		while (--i > 0) if (!this.shouldKeep(stone, values[i], durability, useIndex, ageIndex)) {
 			this.remove(stone, values[i]);
 		};
 	}
 	shouldKeep(stone, val, durability, useIndex, ageIndex) {
-		var _gthis = this;
+		let _gthis = this;
 		switch (durability._hx_index) {
 			case 0:
 				return true;
@@ -191,7 +191,7 @@ class BaseCache extends Register.inherits() {
 		return Promise.resolve(null);
 	}
 	toString() {
-		var c = Boot.getClass(this);
+		let c = Boot.getClass(this);
 		return c.__name__;
 	}
 	static get __name__() {

package/bin/whet/cache/CacheManager.js

@@ -20,9 +20,9 @@ class CacheManager extends Register.inherits() {
 		this.memCache = new MemoryCache(RootDir.fromProject(project));
 	}
 	getSource(stone) {
-		var e = stone.cacheStrategy;
+		let e = stone.cacheStrategy;
 		Log.log(10, ...["Determining cache status.", {"stone": stone, "strategy": Register.global("$hxEnums")[e.__enum__].__constructs__[e._hx_index]._hx_name}]);
-		var _g = stone.cacheStrategy;
+		let _g = stone.cacheStrategy;
 		switch (_g._hx_index) {
 			case 0:
 				return stone.acquire(function () {
@@ -32,16 +32,16 @@ class CacheManager extends Register.inherits() {
 				});
 				break
 			case 1:
-				var _g1 = _g.check;
+				let _g1 = _g.check;
 				return this.memCache.get(stone, _g.durability, (_g1 != null) ? _g1 : DurabilityCheck.AllOnUse);
 				break
 			case 2:
-				var _g1 = _g.check;
-				return this.fileCache.get(stone, _g.durability, (_g1 != null) ? _g1 : DurabilityCheck.AllOnUse);
+				let _g2 = _g.check;
+				return this.fileCache.get(stone, _g.durability, (_g2 != null) ? _g2 : DurabilityCheck.AllOnUse);
 				break
 			case 3:
-				var _g1 = _g.check;
-				return this.fileCache.get(stone, _g.durability, (_g1 != null) ? _g1 : DurabilityCheck.AllOnUse);
+				let _g3 = _g.check;
+				return this.fileCache.get(stone, _g.durability, (_g3 != null) ? _g3 : DurabilityCheck.AllOnUse);
 				break
 			
 		};
@@ -79,8 +79,8 @@ class CacheManager extends Register.inherits() {
 	* The path is not reserved. Caching depends on stone's `cacheStrategy` and success of source generation.
 	*/
 	getDir(stone, hash) {
-		var baseDir = stone.id + "/";
-		var tmp;
+		let baseDir = stone.id + "/";
+		let tmp;
 		switch (stone.cacheStrategy._hx_index) {
 			case 0:
 				tmp = true;
@@ -102,8 +102,8 @@ class CacheManager extends Register.inherits() {
 			throw new Error("\"" + ".whet/" + "\" is not a directory.");
 		};
 		baseDir = Path.posix.join(".whet/", baseDir);
-		var id;
-		var _g = stone.cacheStrategy;
+		let id;
+		let _g = stone.cacheStrategy;
 		switch (_g._hx_index) {
 			case 0:
 				id = baseDir;
@@ -115,8 +115,8 @@ class CacheManager extends Register.inherits() {
 				id = this.fileCache.getUniqueDir(stone, baseDir, hash);
 				break
 			case 3:
-				var _g1 = _g.path;
-				var dir = _g1.substring(0, _g1.lastIndexOf("/") + 1);
+				let _g1 = _g.path;
+				let dir = _g1.substring(0, _g1.lastIndexOf("/") + 1);
 				id = (dir.length == 0) ? "./" : dir;
 				break
 			

package/bin/whet/cache/FileCache.js

@@ -20,26 +20,26 @@ class FileCache extends Register.inherits(BaseCache) {
 		super.new(rootDir, new StringMap());
 		this.dbFile = Path.posix.join(".", rootDir, ".", ".whet/cache.json");
 		try {
-			var db = JSON.parse(Fs.readFileSync(this.dbFile, {"encoding": "utf-8"}));
-			var _g_keys = Reflect__1.fields(db);
-			var _g_index = 0;
+			let db = JSON.parse(Fs.readFileSync(this.dbFile, {"encoding": "utf-8"}));
+			let _g_keys = Reflect__1.fields(db);
+			let _g_index = 0;
 			while (_g_index < _g_keys.length) {
-				var key = _g_keys[_g_index++];
-				var _g_value = db[key];
-				var this1 = this.cache;
-				var _g = [];
-				var _g1 = 0;
+				let key = _g_keys[_g_index++];
+				let _g_value = db[key];
+				let this1 = this.cache;
+				let _g = [];
+				let _g1 = 0;
 				while (_g1 < _g_value.length) {
-					var val = _g_value[_g1];
+					let val = _g_value[_g1];
 					++_g1;
-					var tmp = SourceHash.fromHex(val.hash);
-					var val1 = val.ctime;
-					var val2 = val.baseDir;
-					var _g2 = [];
-					var _g3 = 0;
-					var _g4 = val.files;
+					let tmp = SourceHash.fromHex(val.hash);
+					let val1 = val.ctime;
+					let val2 = val.baseDir;
+					let _g2 = [];
+					let _g3 = 0;
+					let _g4 = val.files;
 					while (_g3 < _g4.length) {
-						var file = _g4[_g3];
+						let file = _g4[_g3];
 						++_g3;
 						_g2.push({"fileHash": SourceHash.fromHex(file.fileHash), "filePath": file.filePath, "id": file.id});
 					};
@@ -54,72 +54,68 @@ class FileCache extends Register.inherits(BaseCache) {
 		return stone.id;
 	}
 	value(source) {
-		var idOverride;
-		var _g = source.origin.cacheStrategy;
+		let idOverride;
+		let _g = source.origin.cacheStrategy;
 		if (_g._hx_index == 3) {
-			var _g1 = _g.path;
+			let _g1 = _g.path;
 			idOverride = (source.data.length == 1) ? _g1.substring(_g1.lastIndexOf("/") + 1) : null;
 		} else {
 			idOverride = null;
 		};
-		var _g = [];
-		var _g1 = 0;
-		var _g2 = source.data;
-		while (_g1 < _g2.length) {
-			var data = [_g2[_g1]];
-			++_g1;
-			_g.push(data[0].getFilePathId(idOverride).then((function (data) {
-				return function (filePath) {
-					return {"fileHash": SourceHash.fromBytes(data[0].data), "filePath": filePath, "id": data[0].id};
-				};
-			})(data)));
+		let _g1 = [];
+		let _g2 = 0;
+		let _g3 = source.data;
+		while (_g2 < _g3.length) {
+			let data = _g3[_g2];
+			++_g2;
+			_g1.push(data.getFilePathId(idOverride).then(function (filePath) {
+				return {"fileHash": SourceHash.fromBytes(data.data), "filePath": filePath, "id": data.id};
+			}));
 		};
-		return Promise.all(_g).then(function (files) {
+		return Promise.all(_g1).then(function (files) {
 			return {"hash": source.hash, "ctime": source.ctime, "baseDir": source.getDirPath(), "ctimePretty": null, "files": files};
 		});
 	}
 	source(stone, value) {
-		var _gthis = this;
-		var _g = stone.cacheStrategy;
+		let _g = stone.cacheStrategy;
 		if (_g._hx_index == 3) {
-			var _g1 = _g.path;
-			var invalidPath;
+			let _g1 = _g.path;
+			let invalidPath;
 			if (value.files.length == 1 && !(_g1.length == 0 || _g1.charCodeAt(_g1.length - 1) == 47)) {
 				invalidPath = value.files[0].filePath != _g1;
 			} else {
-				var dir = _g1.substring(0, _g1.lastIndexOf("/") + 1);
+				let dir = _g1.substring(0, _g1.lastIndexOf("/") + 1);
 				invalidPath = value.baseDir != ((dir.length == 0) ? "./" : dir);
 			};
 			if (invalidPath) {
 				return Promise.resolve(null);
 			};
 		};
-		var _g = [];
-		var _g1 = 0;
-		var _g2 = value.files;
-		while (_g1 < _g2.length) _g.push(new Promise((function (file) {
-			return function (res, rej) {
-				var path = Path.posix.join(".", _gthis.rootDir, ".", file[0].filePath);
-				SourceData.fromFile(file[0].id, path, file[0].filePath).then((function (file) {
-					return function (sourceData) {
-						if (sourceData == null || !stone.ignoreFileHash && !SourceHash.equals(sourceData.hash, file[0].fileHash)) {
-							rej("Invalid.");
-						} else {
-							res(sourceData);
-						};
+		let _gthis = this;
+		let _g1 = [];
+		let _g2 = 0;
+		let _g3 = value.files;
+		while (_g2 < _g3.length) {
+			let file = _g3[_g2];
+			++_g2;
+			_g1.push(new Promise(function (res, rej) {
+				let path = Path.posix.join(".", _gthis.rootDir, ".", file.filePath);
+				SourceData.fromFile(file.id, path, file.filePath).then(function (sourceData) {
+					if (sourceData == null || !stone.ignoreFileHash && !SourceHash.equals(sourceData.hash, file.fileHash)) {
+						rej("Invalid.");
+					} else {
+						res(sourceData);
 					};
-				})(file), (function () {
-					return function (err) {
-						if (((err) instanceof Error) && err.code == "ENOENT") {
-							rej("Invalid.");
-						} else {
-							rej(err);
-						};
+				}, function (err) {
+					if (((err) instanceof Error) && err.code == "ENOENT") {
+						rej("Invalid.");
+					} else {
+						rej(err);
 					};
-				})());
-			};
-		})([_g2[_g1++]])));
-		return Promise.all(_g).then(function (data) {
+				});
+			}));
+		};
+		return Promise.all(_g1).then(function (data) {
 			return new Source(data, value.hash, stone, value.ctime);
 		}, function (rejected) {
 			if (rejected == "Invalid.") {
@@ -131,20 +127,20 @@ class FileCache extends Register.inherits(BaseCache) {
 		});
 	}
 	set(source) {
-		var _gthis = this;
+		let _gthis = this;
 		return super.set(source).then(function (vals) {
 			_gthis.flush();
 			return vals;
 		});
 	}
 	getExistingDirs(stone) {
-		var list = this.cache.inst.get(stone.id);
+		let list = this.cache.inst.get(stone.id);
 		if (list != null) {
-			var result = new Array(list.length);
-			var _g = 0;
-			var _g1 = list.length;
+			let result = new Array(list.length);
+			let _g = 0;
+			let _g1 = list.length;
 			while (_g < _g1) {
-				var i = _g++;
+				let i = _g++;
 				result[i] = list[i].baseDir;
 			};
 			return result;
@@ -153,32 +149,32 @@ class FileCache extends Register.inherits(BaseCache) {
 		};
 	}
 	remove(stone, value) {
-		var _gthis = this;
 		Log.log(20, ...["Removing stone from file cache.", {"stone": stone, "valueHash": SourceHash.toHex(value.hash)}]);
-		var isAlone = Lambda.count(this.cache.inst.get(stone.id), function (v) {
+		let isAlone = Lambda.count(this.cache.inst.get(stone.id), function (v) {
 			return v.baseDir == value.baseDir;
 		}) == 1;
+		let _gthis = this;
 		return super.remove(stone, value).then(function (_) {
 			_gthis.flush();
 			if (!isAlone) {
 				return Promise.resolve(null);
 			} else {
-				var _g = [];
-				var _g1 = 0;
-				var _g2 = value.files;
-				while (_g1 < _g2.length) _g.push(new Promise((function (file) {
-					return function (res, rej) {
-						Log.log(20, ...["Deleting file.", {"path": Path.posix.join(".", _gthis.rootDir, ".", file[0].filePath)}]);
-						Fs.unlink(Path.posix.join(".", _gthis.rootDir, ".", file[0].filePath), (function (file) {
-							return function (err) {
-								if (err != null) {
-									Log.log(50, ...["Error deleting file.", {"file": file[0], "error": err}]);
-								};
-								res(null);
+				let _g = [];
+				let _g1 = 0;
+				let _g2 = value.files;
+				while (_g1 < _g2.length) {
+					let file = _g2[_g1];
+					++_g1;
+					_g.push(new Promise(function (res, rej) {
+						Log.log(20, ...["Deleting file.", {"path": Path.posix.join(".", _gthis.rootDir, ".", file.filePath)}]);
+						Fs.unlink(Path.posix.join(".", _gthis.rootDir, ".", file.filePath), function (err) {
+							if (err != null) {
+								Log.log(50, ...["Error deleting file.", {"file": file, "error": err}]);
 							};
-						})(file));
-					};
-				})([_g2[_g1++]])));
+							res(null);
+						});
+					}));
+				};
 				return Promise.all(_g);
 			};
 		}).then(function (_) {
@@ -202,7 +198,7 @@ class FileCache extends Register.inherits(BaseCache) {
 		});
 	}
 	setRecentUseOrder(values, value) {
-		var changed = super.setRecentUseOrder(values, value);
+		let changed = super.setRecentUseOrder(values, value);
 		if (changed) {
 			this.flush();
 		};
@@ -212,33 +208,33 @@ class FileCache extends Register.inherits(BaseCache) {
 		return value.baseDir;
 	}
 	flush() {
-		var _gthis = this;
 		if (this.flushQueued) {
 			return;
 		};
 		this.flushQueued = true;
+		let _gthis = this;
 		global.setTimeout(function () {
 			_gthis.flushQueued = false;
-			var db = {};
-			var this1 = _gthis.cache;
-			var _g_keys = this1.keys();
+			let db = {};
+			let this1 = _gthis.cache;
+			let _g_keys = this1.keys();
 			while (_g_keys.hasNext()) {
-				var key = _g_keys.next();
-				var _g_value = this1.get(key);
-				var _g = [];
-				var _g1 = 0;
+				let key = _g_keys.next();
+				let _g_value = this1.get(key);
+				let _g = [];
+				let _g1 = 0;
 				while (_g1 < _g_value.length) {
-					var val = _g_value[_g1];
+					let val = _g_value[_g1];
 					++_g1;
-					var tmp = SourceHash.toHex(val.hash);
-					var val1 = val.ctime;
-					var tmp1 = HxOverrides.dateStr(new Date(val.ctime * 1000));
-					var tmp2 = Path.posix.join(".", "./", ".", val.baseDir);
-					var _g2 = [];
-					var _g3 = 0;
-					var _g4 = val.files;
+					let tmp = SourceHash.toHex(val.hash);
+					let val1 = val.ctime;
+					let tmp1 = HxOverrides.dateStr(new Date(val.ctime * 1000));
+					let tmp2 = Path.posix.join(".", "./", ".", val.baseDir);
+					let _g2 = [];
+					let _g3 = 0;
+					let _g4 = val.files;
 					while (_g3 < _g4.length) {
-						var file = _g4[_g3];
+						let file = _g4[_g3];
 						++_g3;
 						_g2.push({"fileHash": SourceHash.toHex(file.fileHash), "filePath": Path.posix.join(".", "./", ".", file.filePath), "id": Path.posix.join(".", "./", ".", file.id)});
 					};

package/bin/whet/cache/MemoryCache.js

@@ -19,25 +19,25 @@ class MemoryCache extends Register.inherits(BaseCache) {
 		return Promise.resolve(value);
 	}
 	getExistingDirs(stone) {
-		var list = this.cache.inst.get(stone);
+		let list = this.cache.inst.get(stone);
 		if (list != null) {
-			var result = new Array(list.length);
-			var _g = 0;
-			var _g1 = list.length;
+			let result = new Array(list.length);
+			let _g = 0;
+			let _g1 = list.length;
 			while (_g < _g1) {
-				var i = _g++;
+				let i = _g++;
 				result[i] = list[i].tryDirPath();
 			};
-			var _g = [];
-			var _g1 = 0;
-			while (_g1 < result.length) {
-				var v = result[_g1];
-				++_g1;
+			let _g2 = [];
+			let _g3 = 0;
+			while (_g3 < result.length) {
+				let v = result[_g3];
+				++_g3;
 				if (v != null) {
-					_g.push(v);
+					_g2.push(v);
 				};
 			};
-			return _g;
+			return _g2;
 		} else {
 			return null;
 		};