whet 0.0.26 → 0.0.28

package/bin/whet/magic/RoutePathType.js

@@ -16,49 +16,49 @@ class RoutePathType_Fields_ {
 		if (!((routerPathType) instanceof Array)) {
 			throw new Error("RoutePath should be a Stone, Router, or an array.");
 		};
-		var _g = [];
-		var _g1 = 0;
-		var _g2 = routerPathType;
+		let _g = [];
+		let _g1 = 0;
+		let _g2 = routerPathType;
 		while (_g1 < _g2.length) {
-			var item = _g2[_g1];
+			let item = _g2[_g1];
 			++_g1;
 			if (((item) instanceof Router) || ((item) instanceof Stone) || typeof(item) == "string") {
 				_g.push({"routeUnder": "", "source": (typeof(item) == "string") ? new Files({"paths": [item]}) : item, "filter": null, "extractDirs": null});
 			} else if (((item) instanceof Array)) {
-				var inner = item;
+				let inner = item;
 				if (typeof(inner[0]) != "string") {
 					throw new Error("First element of RoutePath array should be `routeUnder` (a string).");
 				};
 				if (!(((inner[1]) instanceof Router) || ((inner[1]) instanceof Stone) || typeof(inner[1]) == "string")) {
 					throw new Error("Second element of RoutePath array should be a Stone or Router.");
 				};
-				var tmp;
+				let tmp;
 				switch (inner.length) {
 					case 2:
-						var src = inner[1];
-						var tmp1 = (typeof(src) == "string") ? new Files({"paths": [src]}) : src;
+						let src = inner[1];
+						let tmp1 = (typeof(src) == "string") ? new Files({"paths": [src]}) : src;
 						tmp = {"routeUnder": inner[0], "source": tmp1, "filter": null, "extractDirs": null};
 						break
 					case 3:
-						var src1 = inner[1];
-						var tmp2 = (typeof(src1) == "string") ? new Files({"paths": [src1]}) : src1;
+						let src1 = inner[1];
+						let tmp2 = (typeof(src1) == "string") ? new Files({"paths": [src1]}) : src1;
 						if (!(typeof(inner[2]) == "string" || inner[2] instanceof Minimatch)) {
 							throw new Error("Third" + " element of RoutePath array should be a glob pattern (string or `minimatch` object)");
 						};
-						var tmp3 = MinimatchType_Fields_.makeMinimatch(inner[2]);
+						let tmp3 = MinimatchType_Fields_.makeMinimatch(inner[2]);
 						tmp = {"routeUnder": inner[0], "source": tmp2, "filter": tmp3, "extractDirs": null};
 						break
 					case 4:
-						var src2 = inner[1];
-						var tmp4 = (typeof(src2) == "string") ? new Files({"paths": [src2]}) : src2;
+						let src2 = inner[1];
+						let tmp4 = (typeof(src2) == "string") ? new Files({"paths": [src2]}) : src2;
 						if (!(typeof(inner[2]) == "string" || inner[2] instanceof Minimatch)) {
 							throw new Error("Third" + " element of RoutePath array should be a glob pattern (string or `minimatch` object)");
 						};
-						var tmp5 = MinimatchType_Fields_.makeMinimatch(inner[2]);
+						let tmp5 = MinimatchType_Fields_.makeMinimatch(inner[2]);
 						if (!(typeof(inner[3]) == "string" || inner[3] instanceof Minimatch)) {
 							throw new Error("Fourth" + " element of RoutePath array should be a glob pattern (string or `minimatch` object)");
 						};
-						var tmp6 = MinimatchType_Fields_.makeMinimatch(inner[3]);
+						let tmp6 = MinimatchType_Fields_.makeMinimatch(inner[3]);
 						tmp = {"routeUnder": inner[0], "source": tmp4, "filter": tmp5, "extractDirs": tmp6};
 						break
 					default:

package/bin/whet/magic/StoneId.js

@@ -21,8 +21,8 @@ class StoneId_Fields_ {
 		return c.__name__.split(".").pop();
 	}
 	static getTypeName(stone) {
-		var c = Boot.getClass(stone);
-		var name = c.__name__;
+		let c = Boot.getClass(stone);
+		let name = c.__name__;
 		if (name != "whet.Stone") {
 			return name;
 		} else {

package/bin/whet/route/RouteResult.js

@@ -10,7 +10,7 @@ class RouteResult extends Register.inherits() {
 		this.source = source;
 	}
 	get() {
-		var _gthis = this;
+		let _gthis = this;
 		return this.source.getSource().then(function (data) {
 			return data.get(_gthis.sourceId);
 		});

package/bin/whet/route/Router.js

@@ -15,8 +15,8 @@ class Router extends Register.inherits() {
 		this.routes = (routes != null) ? RoutePathType_Fields_.makeRoutePath(routes) : [];
 	}
 	route(r) {
-		var _g = 0;
-		var _g1 = RoutePathType_Fields_.makeRoutePath(r);
+		let _g = 0;
+		let _g1 = RoutePathType_Fields_.makeRoutePath(r);
 		while (_g < _g1.length) this.routes.push(_g1[_g++]);
 	}
 	
@@ -28,157 +28,155 @@ class Router extends Register.inherits() {
 		return this.getResults([{"pathSoFar": [], "filter": (pattern != null) ? MinimatchType_Fields_.makeMinimatch(pattern) : null, "inProgress": true, "remDirs": []}], []);
 	}
 	getResults(mainFilters, results) {
-		var _gthis = this;
+		let _gthis = this;
 		return new Promise(function (res, rej) {
-			var allRouteProms = [];
-			var _g = 0;
-			var _g1 = _gthis.routes;
+			let allRouteProms = [];
+			let _g = 0;
+			let _g1 = _gthis.routes;
 			while (_g < _g1.length) {
-				var route = _g1[_g];
+				let route = _g1[_g];
 				++_g;
-				var result = new Array(mainFilters.length);
-				var _g2 = 0;
-				var _g3 = mainFilters.length;
+				let result = new Array(mainFilters.length);
+				let _g2 = 0;
+				let _g3 = mainFilters.length;
 				while (_g2 < _g3) {
-					var i = _g2++;
-					var f = mainFilters[i];
+					let i = _g2++;
+					let f = mainFilters[i];
 					result[i] = {"filter": f.filter, "pathSoFar": f.pathSoFar.slice(), "inProgress": f.inProgress, "remDirs": f.remDirs.slice()};
 				};
-				var routeFilters = [result];
-				var possible;
-				var id = route.routeUnder;
+				let routeFilters = result;
+				let possible;
+				let id = route.routeUnder;
 				if (id.length == 0 || id.charCodeAt(id.length - 1) == 47) {
-					var this1 = routeFilters[0];
-					var dir = route.routeUnder;
+					let this1 = routeFilters;
+					let dir = route.routeUnder;
 					if (dir.length == 0 || dir == "./") {
 						possible = true;
 					} else {
-						var _this = dir.split("/");
-						var _g4 = [];
-						var _g5 = 0;
-						while (_g5 < _this.length) {
-							var v = _this[_g5];
-							++_g5;
+						let _this = dir.split("/");
+						let _g = [];
+						let _g1 = 0;
+						while (_g1 < _this.length) {
+							let v = _this[_g1];
+							++_g1;
 							if (v.length > 0) {
-								_g4.push(v);
+								_g.push(v);
 							};
 						};
-						var res1 = true;
-						var i1 = this1.length;
-						while (--i1 >= 0) {
-							var f1 = this1[i1];
-							if (f1.inProgress) {
-								if (f1.remDirs.length != 0) {
-									var i2 = _g4.length;
-									while (--i2 >= 0) {
-										var _g6 = 0;
-										var _g7 = f1.remDirs;
-										while (_g6 < _g7.length) if (_g7[_g6++].match(_g4[i2] + "/")) {
-											_g4.splice(i2, 1);
+						let res = true;
+						let i = this1.length;
+						while (--i >= 0) {
+							let f = this1[i];
+							if (f.inProgress) {
+								if (f.remDirs.length != 0) {
+									let i = _g.length;
+									while (--i >= 0) {
+										let _g1 = 0;
+										let _g2 = f.remDirs;
+										while (_g1 < _g2.length) if (_g2[_g1++].match(_g[i] + "/")) {
+											_g.splice(i, 1);
 											break;
 										};
 									};
 								};
-								f1.pathSoFar = f1.pathSoFar.concat(_g4);
-								if (!(f1.filter == null || Filters.isPathPossible(this1, f1))) {
-									res1 = false;
+								f.pathSoFar = f.pathSoFar.concat(_g);
+								if (!(f.filter == null || Filters.isPathPossible(this1, f))) {
+									res = false;
 									break;
 								};
 							};
 						};
-						possible = res1;
+						possible = res;
 					};
 				} else {
-					var parts = route.routeUnder.split("/");
-					var res2 = true;
-					var i3 = routeFilters[0].length;
-					while (--i3 >= 0) {
-						var f2 = routeFilters[0][i3];
-						if (f2.inProgress) {
-							f2.inProgress = false;
-							if (f2.remDirs.length != 0) {
-								var i4 = parts.length;
-								while (--i4 >= 0) {
-									var _g8 = 0;
-									var _g9 = f2.remDirs;
-									while (_g8 < _g9.length) if (_g9[_g8++].match(parts[i4] + "/")) {
-										parts.splice(i4, 1);
+					let parts = route.routeUnder.split("/");
+					let res = true;
+					let i = routeFilters.length;
+					while (--i >= 0) {
+						let f = routeFilters[i];
+						if (f.inProgress) {
+							f.inProgress = false;
+							if (f.remDirs.length != 0) {
+								let i = parts.length;
+								while (--i >= 0) {
+									let _g = 0;
+									let _g1 = f.remDirs;
+									while (_g < _g1.length) if (_g1[_g++].match(parts[i] + "/")) {
+										parts.splice(i, 1);
 										break;
 									};
 								};
 							};
-							f2.pathSoFar = f2.pathSoFar.concat(parts);
-							if (!(f2.filter == null || f2.filter.match(Path.posix.join(...f2.pathSoFar)))) {
-								res2 = false;
+							f.pathSoFar = f.pathSoFar.concat(parts);
+							if (!(f.filter == null || f.filter.match(Path.posix.join(...f.pathSoFar)))) {
+								res = false;
 								break;
 							};
 						};
 					};
-					possible = res2;
+					possible = res;
 				};
 				if (!possible) {
 					continue;
 				};
 				if (route.filter != null || route.extractDirs != null) {
-					var f3 = route.filter;
-					var extractDir = route.extractDirs;
-					if (extractDir != null && routeFilters[0].length > 0) {
-						routeFilters[0][routeFilters[0].length - 1].remDirs.push(extractDir);
+					let f = route.filter;
+					let extractDir = route.extractDirs;
+					if (extractDir != null && routeFilters.length > 0) {
+						routeFilters[routeFilters.length - 1].remDirs.push(extractDir);
 					};
-					routeFilters[0].push({"pathSoFar": [], "filter": f3, "inProgress": true, "remDirs": []});
+					routeFilters.push({"pathSoFar": [], "filter": f, "inProgress": true, "remDirs": []});
 				};
-				var prom;
+				let prom;
 				if (((route.source) instanceof Stone)) {
-					var stone = [route.source];
-					prom = stone[0].list().then((function (stone, routeFilters) {
-						return function (list) {
-							var _g = 0;
-							while (_g < list.length) {
-								var sourceId = list[_g];
-								++_g;
-								var result = new Array(routeFilters[0].length);
-								var _g1 = 0;
-								var _g2 = routeFilters[0].length;
-								while (_g1 < _g2) {
-									var i = _g1++;
-									var f = routeFilters[0][i];
-									result[i] = {"filter": f.filter, "pathSoFar": f.pathSoFar.slice(), "inProgress": f.inProgress, "remDirs": f.remDirs.slice()};
-								};
-								var finalFilters = result;
-								var parts = sourceId.split("/");
-								var res = true;
-								var i1 = finalFilters.length;
-								while (--i1 >= 0) {
-									var f1 = finalFilters[i1];
-									if (f1.inProgress) {
-										f1.inProgress = false;
-										if (f1.remDirs.length != 0) {
-											var i2 = parts.length;
-											while (--i2 >= 0) {
-												var _g3 = 0;
-												var _g4 = f1.remDirs;
-												while (_g3 < _g4.length) if (_g4[_g3++].match(parts[i2] + "/")) {
-													parts.splice(i2, 1);
-													break;
-												};
+					let stone = route.source;
+					prom = stone.list().then(function (list) {
+						let _g = 0;
+						while (_g < list.length) {
+							let sourceId = list[_g];
+							++_g;
+							let result = new Array(routeFilters.length);
+							let _g1 = 0;
+							let _g2 = routeFilters.length;
+							while (_g1 < _g2) {
+								let i = _g1++;
+								let f = routeFilters[i];
+								result[i] = {"filter": f.filter, "pathSoFar": f.pathSoFar.slice(), "inProgress": f.inProgress, "remDirs": f.remDirs.slice()};
+							};
+							let finalFilters = result;
+							let parts = sourceId.split("/");
+							let res = true;
+							let i = finalFilters.length;
+							while (--i >= 0) {
+								let f = finalFilters[i];
+								if (f.inProgress) {
+									f.inProgress = false;
+									if (f.remDirs.length != 0) {
+										let i = parts.length;
+										while (--i >= 0) {
+											let _g = 0;
+											let _g1 = f.remDirs;
+											while (_g < _g1.length) if (_g1[_g++].match(parts[i] + "/")) {
+												parts.splice(i, 1);
+												break;
 											};
 										};
-										f1.pathSoFar = f1.pathSoFar.concat(parts);
-										if (!(f1.filter == null || f1.filter.match(Path.posix.join(...f1.pathSoFar)))) {
-											res = false;
-											break;
-										};
+									};
+									f.pathSoFar = f.pathSoFar.concat(parts);
+									if (!(f.filter == null || f.filter.match(Path.posix.join(...f.pathSoFar)))) {
+										res = false;
+										break;
 									};
 								};
-								if (res) {
-									var serveId = Path.posix.join(...finalFilters[0].pathSoFar);
-									results.push(new RouteResult(serveId, sourceId, stone[0]));
-								};
+							};
+							if (res) {
+								let serveId = Path.posix.join(...finalFilters[0].pathSoFar);
+								results.push(new RouteResult(serveId, sourceId, stone));
 							};
 						};
-					})(stone, routeFilters));
+					});
 				} else if (((route.source) instanceof Router)) {
-					prom = route.source.getResults(routeFilters[0], results);
+					prom = route.source.getResults(routeFilters, results);
 				} else {
 					throw new Error("Router source must be a Stone or a Router.");
 				};
@@ -195,20 +193,20 @@ class Router extends Register.inherits() {
 	*/
 	getHash(pattern) {
 		return this.get(pattern).then(function (items) {
-			var uniqueStones = [];
-			var _g = 0;
+			let uniqueStones = [];
+			let _g = 0;
 			while (_g < items.length) {
-				var item = items[_g];
+				let item = items[_g];
 				++_g;
 				if (uniqueStones.indexOf(item.source) == -1) {
 					uniqueStones.push(item.source);
 				};
 			};
-			var result = new Array(uniqueStones.length);
-			var _g = 0;
-			var _g1 = uniqueStones.length;
-			while (_g < _g1) {
-				var i = _g++;
+			let result = new Array(uniqueStones.length);
+			let _g1 = 0;
+			let _g2 = uniqueStones.length;
+			while (_g1 < _g2) {
+				let i = _g1++;
 				result[i] = uniqueStones[i].getHash();
 			};
 			return Promise.all(result).then(function (hashes) {
@@ -224,32 +222,30 @@ class Router extends Register.inherits() {
 		if (clearFirst == null) {
 			clearFirst = true;
 		};
-		var _gthis = this;
+		let _gthis = this;
 		return ((clearFirst) ? Utils.deleteAll(saveInto) : Promise.resolve(null)).then(function (_) {
 			return _gthis.get(pattern);
 		}).then(function (result) {
-			var _g = [];
-			var _g1 = 0;
+			let _g = [];
+			let _g1 = 0;
 			while (_g1 < result.length) {
-				var r = result[_g1];
+				let r = result[_g1];
 				++_g1;
-				var p = [Path.join(saveInto, Path.posix.join(".", "./", ".", r.serveId))];
-				_g.push(r.get().then((function (p) {
-					return function (src) {
-						return Utils.saveBytes(p[0], src.data);
-					};
-				})(p)));
+				let p = Path.join(saveInto, Path.posix.join(".", "./", ".", r.serveId));
+				_g.push(r.get().then(function (src) {
+					return Utils.saveBytes(p, src.data);
+				}));
 			};
 			return Promise.all(_g);
 		});
 	}
 	listContents(pattern) {
 		return this.get(pattern).then(function (files) {
-			var result = new Array(files.length);
-			var _g = 0;
-			var _g1 = files.length;
+			let result = new Array(files.length);
+			let _g = 0;
+			let _g1 = files.length;
 			while (_g < _g1) {
-				var i = _g++;
+				let i = _g++;
 				result[i] = files[i].serveId;
 			};
 			result.sort(function (a, b) {
@@ -279,10 +275,10 @@ class Filters {
 		if (f.filter.options.matchBase) {
 			return true;
 		};
-		var _g = 0;
-		var _g1 = f.filter.set;
+		let _g = 0;
+		let _g1 = f.filter.set;
 		while (_g < _g1.length) {
-			var hit = f.filter.matchOne(f.pathSoFar, _g1[_g++], true);
+			let hit = f.filter.matchOne(f.pathSoFar, _g1[_g++], true);
 			if (hit) {
 				if (f.filter.options.flipNegate) {
 					return true;

package/bin/whet/stones/Files.js

@@ -16,33 +16,31 @@ class Files extends Register.inherits(Stone) {
 		this.config.recursive = true;
 	}
 	list() {
-		var _gthis = this;
-		var onDirFile = function (dir, dirFile) {
-			var pathId = IdUtils.fromCwdPath(dirFile, RootDir.fromProject(_gthis.project));
+		let _gthis = this;
+		let onDirFile = function (dir, dirFile) {
+			let pathId = IdUtils.fromCwdPath(dirFile, RootDir.fromProject(_gthis.project));
 			if (!(dir.length == 0 || dir.charCodeAt(dir.length - 1) == 47)) {
 				throw new Error("\"" + dir + "\" is not a directory.");
 			};
-			var inlobj_id;
-			var dir1 = pathId.substring(0, pathId.lastIndexOf("/") + 1);
+			let inlobj_id;
+			let dir1 = pathId.substring(0, pathId.lastIndexOf("/") + 1);
 			inlobj_id = ((dir1.length == 0) ? "./" : dir1).indexOf(dir) == 0;
 			return (inlobj_id) ? pathId.substring(dir.length) : null;
 		};
-		var files = [];
-		var dirs = [];
-		var _g = 0;
-		var _g1 = MaybeArray_Fields_.makeArray(this.config.paths);
+		let files = [];
+		let dirs = [];
+		let _g = 0;
+		let _g1 = MaybeArray_Fields_.makeArray(this.config.paths);
 		while (_g < _g1.length) {
-			var path = [_g1[_g]];
+			let path = _g1[_g];
 			++_g;
-			if (path[0].length == 0 || path[0].charCodeAt(path[0].length - 1) == 47) {
-				dirs.push(Utils.listDirectoryFiles(this.cwdPath(path[0]), this.config.recursive).then((function (path) {
-					return function (arr) {
-						var _g = 0;
-						while (_g < arr.length) files.push(onDirFile(path[0], arr[_g++]));
-					};
-				})(path)));
+			if (path.length == 0 || path.charCodeAt(path.length - 1) == 47) {
+				dirs.push(Utils.listDirectoryFiles(this.cwdPath(path), this.config.recursive).then(function (arr) {
+					let _g = 0;
+					while (_g < arr.length) files.push(onDirFile(path, arr[_g++]));
+				}));
 			} else {
-				var id = path[0];
+				let id = path;
 				files.push(id.substring(id.lastIndexOf("/") + 1));
 			};
 		};
@@ -51,34 +49,32 @@ class Files extends Register.inherits(Stone) {
 		});
 	}
 	generate(hash) {
-		var _gthis = this;
-		var onDirFile = function (dir, dirFile) {
-			var pathId = IdUtils.fromCwdPath(dirFile, RootDir.fromProject(_gthis.project));
+		let _gthis = this;
+		let onDirFile = function (dir, dirFile) {
+			let pathId = IdUtils.fromCwdPath(dirFile, RootDir.fromProject(_gthis.project));
 			if (!(dir.length == 0 || dir.charCodeAt(dir.length - 1) == 47)) {
 				throw new Error("\"" + dir + "\" is not a directory.");
 			};
-			var p_id;
-			var dir1 = pathId.substring(0, pathId.lastIndexOf("/") + 1);
+			let p_id;
+			let dir1 = pathId.substring(0, pathId.lastIndexOf("/") + 1);
 			p_id = ((dir1.length == 0) ? "./" : dir1).indexOf(dir) == 0;
 			return SourceData.fromFile((p_id) ? pathId.substring(dir.length) : null, dirFile, pathId);
 		};
-		var files = [];
-		var dirs = [];
-		var _g = 0;
-		var _g1 = MaybeArray_Fields_.makeArray(this.config.paths);
+		let files = [];
+		let dirs = [];
+		let _g = 0;
+		let _g1 = MaybeArray_Fields_.makeArray(this.config.paths);
 		while (_g < _g1.length) {
-			var path = [_g1[_g]];
+			let path = _g1[_g];
 			++_g;
-			if (path[0].length == 0 || path[0].charCodeAt(path[0].length - 1) == 47) {
-				dirs.push(Utils.listDirectoryFiles(this.cwdPath(path[0]), this.config.recursive).then((function (path) {
-					return function (arr) {
-						var _g = 0;
-						while (_g < arr.length) files.push(onDirFile(path[0], arr[_g++]));
-					};
-				})(path)));
+			if (path.length == 0 || path.charCodeAt(path.length - 1) == 47) {
+				dirs.push(Utils.listDirectoryFiles(this.cwdPath(path), this.config.recursive).then(function (arr) {
+					let _g = 0;
+					while (_g < arr.length) files.push(onDirFile(path, arr[_g++]));
+				}));
 			} else {
-				var id = path[0];
-				files.push(SourceData.fromFile(id.substring(id.lastIndexOf("/") + 1), _gthis.cwdPath(path[0]), path[0]));
+				let id = path;
+				files.push(SourceData.fromFile(id.substring(id.lastIndexOf("/") + 1), _gthis.cwdPath(path), path));
 			};
 		};
 		return Promise.all(dirs).then(function (_) {
@@ -88,22 +84,20 @@ class Files extends Register.inherits(Stone) {
 		});
 	}
 	walk(onFile, onDirFile) {
-		var files = [];
-		var dirs = [];
-		var _g = 0;
-		var _g1 = MaybeArray_Fields_.makeArray(this.config.paths);
+		let files = [];
+		let dirs = [];
+		let _g = 0;
+		let _g1 = MaybeArray_Fields_.makeArray(this.config.paths);
 		while (_g < _g1.length) {
-			var path = [_g1[_g]];
+			let path = _g1[_g];
 			++_g;
-			if (path[0].length == 0 || path[0].charCodeAt(path[0].length - 1) == 47) {
-				dirs.push(Utils.listDirectoryFiles(this.cwdPath(path[0]), this.config.recursive).then((function (path) {
-					return function (arr) {
-						var _g = 0;
-						while (_g < arr.length) files.push(onDirFile(path[0], arr[_g++]));
-					};
-				})(path)));
+			if (path.length == 0 || path.charCodeAt(path.length - 1) == 47) {
+				dirs.push(Utils.listDirectoryFiles(this.cwdPath(path), this.config.recursive).then(function (arr) {
+					let _g = 0;
+					while (_g < arr.length) files.push(onDirFile(path, arr[_g++]));
+				}));
 			} else {
-				files.push(onFile(path[0]));
+				files.push(onFile(path));
 			};
 		};
 		return Promise.all(dirs).then(function (_) {
@@ -111,12 +105,12 @@ class Files extends Register.inherits(Stone) {
 		});
 	}
 	fromCwd(file, dir) {
-		var pathId = IdUtils.fromCwdPath(file, RootDir.fromProject(this.project));
+		let pathId = IdUtils.fromCwdPath(file, RootDir.fromProject(this.project));
 		if (!(dir.length == 0 || dir.charCodeAt(dir.length - 1) == 47)) {
 			throw new Error("\"" + dir + "\" is not a directory.");
 		};
-		var tmp;
-		var dir1 = pathId.substring(0, pathId.lastIndexOf("/") + 1);
+		let tmp;
+		let dir1 = pathId.substring(0, pathId.lastIndexOf("/") + 1);
 		tmp = ((dir1.length == 0) ? "./" : dir1).indexOf(dir) == 0;
 		return {"pathId": pathId, "id": (tmp) ? pathId.substring(dir.length) : null};
 	}

package/bin/whet/stones/JsonStone.js

@@ -20,32 +20,32 @@ class JsonStone extends Register.inherits(Stone) {
 		return this;
 	}
 	generate(hash) {
-		var _gthis = this;
-		var obj = {};
-		var access = this.data;
-		var _g_keys = Reflect__1.fields(access);
-		var _g_index = 0;
+		let obj = {};
+		let access = this.data;
+		let _g_keys = Reflect__1.fields(access);
+		let _g_index = 0;
 		while (_g_index < _g_keys.length) {
-			var key = _g_keys[_g_index++];
+			let key = _g_keys[_g_index++];
 			obj[key] = access[key];
 		};
+		let _gthis = this;
 		return this.config.mergeFiles.get().then(function (list) {
-			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].get();
 			};
 			return Promise.all(result);
 		}).then(function (dataArr) {
-			var _g = 0;
+			let _g = 0;
 			while (_g < dataArr.length) {
-				var file = JSON.parse(dataArr[_g++].data.toString());
-				var _g_keys = Reflect__1.fields(file);
-				var _g_index = 0;
+				let file = JSON.parse(dataArr[_g++].data.toString());
+				let _g_keys = Reflect__1.fields(file);
+				let _g_index = 0;
 				while (_g_index < _g_keys.length) {
-					var key = _g_keys[_g_index++];
+					let key = _g_keys[_g_index++];
 					obj[key] = file[key];
 				};
 			};
@@ -53,7 +53,7 @@ class JsonStone extends Register.inherits(Stone) {
 		});
 	}
 	generateHash() {
-		var _gthis = this;
+		let _gthis = this;
 		return this.config.mergeFiles.getHash().then(function (hash) {
 			return hash.add(SourceHash.fromString(JSON.stringify(_gthis.data)));
 		});