whet 0.0.19 → 0.0.21

package/bin/whet/route/Router.js

@@ -3,12 +3,9 @@ import {RoutePathType_Fields_} from "../magic/RoutePathType.js"
 import {MinimatchType_Fields_} from "../magic/MinimatchType.js"
 import {Utils} from "../Utils.js"
 import {Stone} from "../Stone.js"
-import {SourceId} from "../SourceId.js"
 import {SourceHash} from "../SourceHash.js"
 import * as Path from "path"
 import {Register} from "../../genes/Register.js"
-import {StringTools} from "../../StringTools.js"
-import {HxOverrides} from "../../HxOverrides.js"
 
 const $global = Register.$global
 
@@ -28,125 +25,167 @@ class Router extends Register.inherits() {
 	* @param pattern A glob pattern to search for.
 	*/
 	get(pattern) {
-		if (pattern == null) {
-			pattern = "**";
-		};
+		return this.getResults([{"pathSoFar": [], "filter": (pattern != null) ? MinimatchType_Fields_.makeMinimatch(pattern) : null, "inProgress": true, "remDirs": []}], []);
+	}
+	getResults(mainFilters, results) {
 		var _gthis = this;
-		var filter = MinimatchType_Fields_.makeMinimatch(pattern);
 		return new Promise(function (res, rej) {
-			var result = [];
-			var _g = [];
-			var _g1 = 0;
-			var _g2 = _gthis.routes;
-			while (_g1 < _g2.length) {
-				var route = [_g2[_g1]];
-				++_g1;
-				var route1 = [route[0]];
-				var tmp;
-				if (((route1[0].source) instanceof Stone)) {
-					var stone = [route1[0].source];
-					tmp = stone[0].list().then((function (stone, route) {
-						return function (list) {
-							var arr = [];
-							var _g = 0;
-							while (_g < list.length) {
-								var path = list[_g];
-								++_g;
-								var serveId = null;
-								if (route[0].filter == null || route[0].filter.match(path)) {
-									serveId = path;
-									if (route[0].extractDirs != null) {
-										var dir = path;
-										while (true) {
-											dir = dir.substring(0, dir.lastIndexOf("/"));
-											if (route[0].extractDirs.match(dir + "/")) {
-												var s = dir + "/";
-												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;
-												serveId = SourceId.relativeTo(path, (HxOverrides.cca(s, 0) == 47) ? s : "/" + s);
-												break;
-											};
-											if (!(dir.length > 0)) {
-												break;
-											};
+			var allRouteProms = [];
+			var _g = 0;
+			var _g1 = _gthis.routes;
+			while (_g < _g1.length) {
+				var route = _g1[_g];
+				++_g;
+				var result = new Array(mainFilters.length);
+				var _g2 = 0;
+				var _g3 = mainFilters.length;
+				while (_g2 < _g3) {
+					var i = _g2++;
+					var 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;
+				if (id.length == 0 || id.charCodeAt(id.length - 1) == 47) {
+					var this1 = routeFilters[0];
+					var 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;
+							if (v.length > 0) {
+								_g4.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);
+											break;
 										};
 									};
 								};
-								var serveId1 = serveId;
-								if (serveId1 != null) {
-									arr.push(new RouteResult(serveId1, path, stone[0]));
+								f1.pathSoFar = f1.pathSoFar.concat(_g4);
+								if (!(f1.filter == null || Filters.isPathPossible(this1, f1))) {
+									res1 = false;
+									break;
 								};
 							};
-							return arr;
 						};
-					})(stone, route1));
-				} else if (((route1[0].source) instanceof Router)) {
-					tmp = route1[0].source.get().then((function (route) {
+						possible = res1;
+					};
+				} 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);
+										break;
+									};
+								};
+							};
+							f2.pathSoFar = f2.pathSoFar.concat(parts);
+							if (!(f2.filter == null || f2.filter.match(Path.posix.join(...f2.pathSoFar)))) {
+								res2 = false;
+								break;
+							};
+						};
+					};
+					possible = res2;
+				};
+				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);
+					};
+					routeFilters[0].push({"pathSoFar": [], "filter": f3, "inProgress": true, "remDirs": []});
+				};
+				var prom;
+				if (((route.source) instanceof Stone)) {
+					var stone = [route.source];
+					prom = stone[0].list().then((function (stone, routeFilters) {
 						return function (list) {
-							var arr = [];
 							var _g = 0;
 							while (_g < list.length) {
-								var result = list[_g];
+								var sourceId = list[_g];
 								++_g;
-								var path = result.serveId;
-								var serveId = null;
-								if (route[0].filter == null || route[0].filter.match(path)) {
-									serveId = path;
-									if (route[0].extractDirs != null) {
-										var dir = path;
-										while (true) {
-											dir = dir.substring(0, dir.lastIndexOf("/"));
-											if (route[0].extractDirs.match(dir + "/")) {
-												var s = dir + "/";
-												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, "\\", "/");
+								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;
 												};
-												s = str;
-												serveId = SourceId.relativeTo(path, (HxOverrides.cca(s, 0) == 47) ? s : "/" + s);
-												break;
-											};
-											if (!(dir.length > 0)) {
-												break;
 											};
 										};
+										f1.pathSoFar = f1.pathSoFar.concat(parts);
+										if (!(f1.filter == null || f1.filter.match(Path.posix.join(...f1.pathSoFar)))) {
+											res = false;
+											break;
+										};
 									};
 								};
-								var serveId1 = serveId;
-								if (serveId1 != null) {
-									result.serveId = serveId1;
-									arr.push(result);
+								if (res) {
+									var serveId = Path.posix.join(...finalFilters[0].pathSoFar);
+									results.push(new RouteResult(serveId, sourceId, stone[0]));
 								};
 							};
-							return arr;
 						};
-					})(route1));
+					})(stone, routeFilters));
+				} else if (((route.source) instanceof Router)) {
+					prom = route.source.getResults(routeFilters[0], results);
 				} else {
 					throw new Error("Router source must be a Stone or a Router.");
 				};
-				_g.push(tmp.then((function (route) {
-					return function (list) {
-						var this1 = route[0].routeUnder;
-						var routeUnderIsDir = HxOverrides.cca(this1, this1.length - 1) == 47;
-						var _g = 0;
-						while (_g < list.length) {
-							var item = list[_g];
-							++_g;
-							item.serveId = (routeUnderIsDir) ? SourceId.getPutInDir(item.serveId, route[0].routeUnder) : route[0].routeUnder;
-							if (filter.match(item.serveId)) {
-								result.push(item);
-							};
-						};
-					};
-				})(route)));
+				allRouteProms.push(prom);
 			};
-			Promise.all(_g).then(function (_) {
-				res(result);
+			Promise.all(allRouteProms).then(function (_) {
+				res(results);
 			});
 		});
 	}
@@ -155,9 +194,6 @@ class Router extends Register.inherits() {
 	* Get combined hash of all sources that fit the `pattern`.
 	*/
 	getHash(pattern) {
-		if (pattern == null) {
-			pattern = "**";
-		};
 		return this.get(pattern).then(function (items) {
 			var uniqueStones = [];
 			var _g = 0;
@@ -197,20 +233,7 @@ class Router extends Register.inherits() {
 			while (_g1 < result.length) {
 				var r = result[_g1];
 				++_g1;
-				var saveInto1 = saveInto;
-				var this1 = r.serveId;
-				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 (this1.charAt(0) != "/") {
-					throw new Error("Badly formed SourceId.");
-				};
-				var p = [Path.join(saveInto1, Path.posix.join(".", root, ".", this1))];
+				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);
@@ -221,9 +244,6 @@ class Router extends Register.inherits() {
 		});
 	}
 	listContents(pattern) {
-		if (pattern == null) {
-			pattern = "**";
-		};
 		return this.get(pattern).then(function (files) {
 			var result = new Array(files.length);
 			var _g = 0;
@@ -244,122 +264,41 @@ class Router extends Register.inherits() {
 			return result.join("\n");
 		});
 	}
-	allFromRoute(route) {
-		if (((route.source) instanceof Stone)) {
-			var stone = route.source;
-			return stone.list().then(function (list) {
-				var arr = [];
-				var _g = 0;
-				while (_g < list.length) {
-					var path = list[_g];
-					++_g;
-					var serveId = null;
-					if (route.filter == null || route.filter.match(path)) {
-						serveId = path;
-						if (route.extractDirs != null) {
-							var dir = path;
-							while (true) {
-								dir = dir.substring(0, dir.lastIndexOf("/"));
-								if (route.extractDirs.match(dir + "/")) {
-									var s = dir + "/";
-									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;
-									serveId = SourceId.relativeTo(path, (HxOverrides.cca(s, 0) == 47) ? s : "/" + s);
-									break;
-								};
-								if (!(dir.length > 0)) {
-									break;
-								};
-							};
-						};
-					};
-					var serveId1 = serveId;
-					if (serveId1 != null) {
-						arr.push(new RouteResult(serveId1, path, stone));
-					};
-				};
-				return arr;
-			});
-		} else if (((route.source) instanceof Router)) {
-			return route.source.get().then(function (list) {
-				var arr = [];
-				var _g = 0;
-				while (_g < list.length) {
-					var result = list[_g];
-					++_g;
-					var path = result.serveId;
-					var serveId = null;
-					if (route.filter == null || route.filter.match(path)) {
-						serveId = path;
-						if (route.extractDirs != null) {
-							var dir = path;
-							while (true) {
-								dir = dir.substring(0, dir.lastIndexOf("/"));
-								if (route.extractDirs.match(dir + "/")) {
-									var s = dir + "/";
-									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;
-									serveId = SourceId.relativeTo(path, (HxOverrides.cca(s, 0) == 47) ? s : "/" + s);
-									break;
-								};
-								if (!(dir.length > 0)) {
-									break;
-								};
-							};
-						};
-					};
-					var serveId1 = serveId;
-					if (serveId1 != null) {
-						result.serveId = serveId1;
-						arr.push(result);
-					};
-				};
-				return arr;
-			});
-		} else {
-			throw new Error("Router source must be a Stone or a Router.");
-		};
+	static get __name__() {
+		return "whet.route.Router"
 	}
-	getServeId(path, route) {
-		var serveId = null;
-		if (route.filter == null || route.filter.match(path)) {
-			serveId = path;
-			if (route.extractDirs != null) {
-				var dir = path;
-				while (true) {
-					dir = dir.substring(0, dir.lastIndexOf("/"));
-					if (route.extractDirs.match(dir + "/")) {
-						var s = dir + "/";
-						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;
-						serveId = SourceId.relativeTo(path, (HxOverrides.cca(s, 0) == 47) ? s : "/" + s);
-						break;
-					};
-					if (!(dir.length > 0)) {
-						break;
-					};
-				};
+	get __class__() {
+		return Router
+	}
+}
+
+
+export const Filters = Register.global("$hxClasses")["whet.route._Router.Filters"] = 
+class Filters {
+	static isPathPossible(this1, f) {
+		if (f.filter.options.matchBase) {
+			return true;
+		};
+		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;
 			};
 		};
-		return serveId;
+		if (f.filter.options.flipNegate) {
+			return false;
+		} else {
+			return false != f.filter.negate;
+		};
 	}
 	static get __name__() {
-		return "whet.route.Router"
+		return "whet.route._Router.Filters_Impl_"
 	}
 	get __class__() {
-		return Router
+		return Filters
 	}
 }
 

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

@@ -9,7 +9,13 @@ import {Project} from "../Project"
 export declare class Files extends Stone<FilesConfig> {
 	constructor(config: FilesConfig)
 	protected initConfig(): void
+	list(): Promise<string[]>
 	protected generate(hash: SourceHash): Promise<SourceData[]>
+	protected walk<T>(onFile: ((arg0: string) => T), onDirFile: ((arg0: string, arg1: string) => T)): Promise<T[]>
+	protected fromCwd(file: string, dir: string): {
+		id: string, 
+		pathId: string
+	}
 }
 
 export type FilesConfig = {

package/bin/whet/stones/Files.js

@@ -1,12 +1,9 @@
 import {MaybeArray_Fields_} from "../magic/MaybeArray.js"
 import {Utils} from "../Utils.js"
 import {Stone} from "../Stone.js"
-import {SourceId_Fields_, RootDir, SourceId} from "../SourceId.js"
+import {IdUtils, RootDir} from "../SourceId.js"
 import {SourceData} from "../Source.js"
-import * as Path from "path"
 import {Register} from "../../genes/Register.js"
-import {StringTools} from "../../StringTools.js"
-import {HxOverrides} from "../../HxOverrides.js"
 
 const $global = Register.$global
 
@@ -18,65 +15,111 @@ class Files extends Register.inherits(Stone) {
 	initConfig() {
 		this.config.recursive = true;
 	}
-	generate(hash) {
+	list() {
 		var _gthis = this;
-		var _g = [];
-		var _g1 = 0;
-		var _g2 = MaybeArray_Fields_.makeArray(this.config.paths);
-		while (_g1 < _g2.length) {
-			var pathString = _g2[_g1];
-			++_g1;
-			var s = pathString;
-			var str = (pathString.length > 1 && HxOverrides.cca(pathString, 0) == 47) ? pathString.substring(1) : pathString;
-			if (str.length > 0) {
-				str = Path.posix.normalize(str);
-				str = StringTools.replace(str, "\\", "/");
+		var onDirFile = function (dir, dirFile) {
+			var 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.");
 			};
-			s = str;
-			var path = [(HxOverrides.cca(s, 0) == 47) ? s : "/" + s];
-			if (HxOverrides.cca(path[0], path[0].length - 1) == 47) {
-				_g.push(Utils.listDirectoryFiles(this.cwdPath(pathString), this.config.recursive).then((function (path) {
+			var inlobj_id;
+			var 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);
+		while (_g < _g1.length) {
+			var 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 = [];
-						var _g1 = 0;
-						while (_g1 < arr.length) {
-							var file = arr[_g1];
-							++_g1;
-							var s = SourceId_Fields_.fromCwdPath(file, RootDir.fromProject(_gthis.project));
-							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;
-							var pathId = (HxOverrides.cca(s, 0) == 47) ? s : "/" + s;
-							_g.push(SourceData.fromFile(SourceId.relativeTo(pathId, path[0]), file, pathId));
-						};
-						return _g;
-					};
-				})(path)).then((function () {
-					return function (f) {
-						return Promise.all(f);
+						var _g = 0;
+						while (_g < arr.length) files.push(onDirFile(path[0], arr[_g++]));
 					};
-				})()));
+				})(path)));
 			} else {
-				_g.push(SourceData.fromFile(path[0].substring(path[0].lastIndexOf("/")), this.cwdPath(path[0]), path[0]).then((function () {
-					return function (src) {
-						return [src];
+				var id = path[0];
+				files.push(id.substring(id.lastIndexOf("/") + 1));
+			};
+		};
+		return Promise.all(dirs).then(function (_) {
+			return files;
+		});
+	}
+	generate(hash) {
+		var _gthis = this;
+		var onDirFile = function (dir, dirFile) {
+			var 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);
+			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);
+		while (_g < _g1.length) {
+			var 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)));
+			} else {
+				var id = path[0];
+				files.push(SourceData.fromFile(id.substring(id.lastIndexOf("/") + 1), _gthis.cwdPath(path[0]), path[0]));
 			};
 		};
-		return Promise.all(_g).then(function (allSources) {
-			var _g = [];
-			var _g_current = 0;
-			while (_g_current < allSources.length) {
-				var x = Register.iter(allSources[_g_current++]);
-				while (x.hasNext()) _g.push(x.next());
+		return Promise.all(dirs).then(function (_) {
+			return files;
+		}).then(function (fileProms) {
+			return Promise.all(fileProms);
+		});
+	}
+	walk(onFile, onDirFile) {
+		var files = [];
+		var dirs = [];
+		var _g = 0;
+		var _g1 = MaybeArray_Fields_.makeArray(this.config.paths);
+		while (_g < _g1.length) {
+			var 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)));
+			} else {
+				files.push(onFile(path[0]));
 			};
-			return _g;
+		};
+		return Promise.all(dirs).then(function (_) {
+			return files;
 		});
 	}
+	fromCwd(file, dir) {
+		var 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);
+		tmp = ((dir1.length == 0) ? "./" : dir1).indexOf(dir) == 0;
+		return {"pathId": pathId, "id": (tmp) ? pathId.substring(dir.length) : null};
+	}
 	static get __name__() {
 		return "whet.stones.Files"
 	}

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

@@ -1,5 +1,5 @@
+import {Router} from "../route/Router"
 import {StoneIdType} from "../magic/StoneId"
-import {RoutePathType} from "../magic/RoutePathType"
 import {MaybeArray} from "../magic/MaybeArray"
 import {CacheStrategy} from "../cache/Cache"
 import {Stone, AnyStone} from "../Stone"
@@ -39,7 +39,7 @@ export type JsonStoneConfig = {
 	Defaults to the Stone's class name.
 	*/
 	id?: null | StoneIdType, 
-	mergeFiles?: null | RoutePathType, 
+	mergeFiles?: null | Router, 
 	name?: null | string, 
 	/**
 	Defaults to the last instanced project.