whet 0.0.15 → 0.0.16

package/bin/whet/route/Router.js

@@ -1,5 +1,8 @@
+import {RouteResult} from "./RouteResult.js"
 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"
@@ -21,99 +24,141 @@ class Router extends Register.inherits() {
 	}
 	
 	/**
-	* Find data sources routed under `id`. By default only single result is returned if `id`
-	* is not a directory, all results otherwise. This can be overriden by providing a second argument.
+	* Find data sources routed under `pattern`.
+	* @param pattern A glob pattern to search for.
 	*/
-	find(id, firstOnly) {
-		var _gthis = this;
-		var s = id;
-		var str = (id.length > 1 && HxOverrides.cca(id, 0) == 47) ? id.substring(1) : id;
-		if (str.length > 0) {
-			str = Path.posix.normalize(str);
-			str = StringTools.replace(str, "\\", "/");
+	get(pattern) {
+		if (pattern == null) {
+			pattern = "**";
 		};
-		s = str;
-		var sourceId = (HxOverrides.cca(s, 0) == 47) ? s : "/" + s;
+		var _gthis = this;
+		var filter = MinimatchType_Fields_.makeMinimatch(pattern);
 		return new Promise(function (res, rej) {
-			if (firstOnly == null) {
-				firstOnly = HxOverrides.cca(sourceId, sourceId.length - 1) != 47;
-			};
 			var result = [];
 			var _g = [];
 			var _g1 = 0;
 			var _g2 = _gthis.routes;
 			while (_g1 < _g2.length) {
-				var path = [_g2[_g1]];
+				var route = [_g2[_g1]];
 				++_g1;
-				_g.push(path[0].route.list().then((function (path) {
-					return function (list) {
-						var this1 = path[0].routeUnder;
-						if (HxOverrides.cca(this1, this1.length - 1) == 47) {
+				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 item = list[_g];
+								var path = list[_g];
 								++_g;
-								item.serveId = SourceId.getPutInDir(item.serveId, path[0].routeUnder);
-								if (HxOverrides.cca(sourceId, sourceId.length - 1) == 47) {
-									var rel = SourceId.relativeTo(item.serveId, sourceId);
-									if (rel != null) {
-										item.serveId = rel;
-										result.push(item);
-									};
-								} else if (sourceId == item.serveId) {
-									var s = sourceId.substring(sourceId.lastIndexOf("/"));
-									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 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;
+											};
+										};
 									};
-									s = str;
-									item.serveId = (HxOverrides.cca(s, 0) == 47) ? s : "/" + s;
-									result.push(item);
+								};
+								var serveId1 = serveId;
+								if (serveId1 != null) {
+									arr.push(new RouteResult(serveId1, path, stone[0]));
 								};
 							};
-						} else {
+							return arr;
+						};
+					})(stone, route1));
+				} else if (((route1[0].source) instanceof Router)) {
+					tmp = route1[0].source.get().then((function (route) {
+						return function (list) {
+							var arr = [];
 							var _g = 0;
 							while (_g < list.length) {
-								var item = list[_g];
+								var result = list[_g];
 								++_g;
-								item.serveId = path[0].routeUnder;
-								if (HxOverrides.cca(sourceId, sourceId.length - 1) == 47) {
-									var rel = SourceId.relativeTo(item.serveId, sourceId);
-									if (rel != null) {
-										item.serveId = rel;
-										result.push(item);
+								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, "\\", "/");
+												};
+												s = str;
+												serveId = SourceId.relativeTo(path, (HxOverrides.cca(s, 0) == 47) ? s : "/" + s);
+												break;
+											};
+											if (!(dir.length > 0)) {
+												break;
+											};
+										};
 									};
-								} else if (sourceId == item.serveId) {
-									var s = sourceId.substring(sourceId.lastIndexOf("/"));
-									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;
-									item.serveId = (HxOverrides.cca(s, 0) == 47) ? s : "/" + s;
-									result.push(item);
+								};
+								var serveId1 = serveId;
+								if (serveId1 != null) {
+									result.serveId = serveId1;
+									arr.push(result);
 								};
 							};
+							return arr;
+						};
+					})(route1));
+				} 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);
+							};
 						};
 					};
-				})(path)));
+				})(route)));
 			};
 			Promise.all(_g).then(function (_) {
-				if (firstOnly && result.length > 1) {
-					result.length = 1;
-				};
 				res(result);
 			});
 		});
 	}
 	
 	/**
-	* Get combined hash of all sources that would be found under supplied id.
+	* Get combined hash of all sources that fit the `pattern`.
 	*/
-	getHash(id, firstOnly) {
-		return this.find(id, firstOnly).then(function (items) {
+	getHash(pattern) {
+		if (pattern == null) {
+			pattern = "**";
+		};
+		return this.get(pattern).then(function (items) {
 			var uniqueStones = [];
 			var _g = 0;
 			while (_g < items.length) {
@@ -135,40 +180,17 @@ class Router extends Register.inherits() {
 			});
 		});
 	}
-	getHashOfEverything() {
-		var _this = this.routes;
-		var result = new Array(_this.length);
-		var _g = 0;
-		var _g1 = _this.length;
-		while (_g < _g1) {
-			var i = _g++;
-			var _this1 = _this[i].route.routes;
-			var result1 = new Array(_this1.length);
-			var _g2 = 0;
-			var _g3 = _this1.length;
-			while (_g2 < _g3) {
-				var i1 = _g2++;
-				result1[i1] = _this1[i1].stone.getHash();
-			};
-			result[i] = Promise.all(result1).then(function (hashes) {
-				return SourceHash.merge(...hashes);
-			});
-		};
-		return Promise.all(result).then(function (hashes) {
-			return SourceHash.merge(...hashes);
-		});
-	}
 	
 	/**
-	* Save files filtered by `searchId` into provided `saveInto` folder.
+	* Save files filtered by `pattern` into provided `saveInto` folder.
 	*/
-	saveInto(searchId, saveInto, clearFirst) {
+	saveInto(pattern, saveInto, clearFirst) {
 		if (clearFirst == null) {
 			clearFirst = true;
 		};
 		var _gthis = this;
 		return ((clearFirst) ? Utils.deleteAll(saveInto) : Promise.resolve(null)).then(function (_) {
-			return _gthis.find(searchId);
+			return _gthis.get(pattern);
 		}).then(function (result) {
 			var _g = [];
 			var _g1 = 0;
@@ -198,11 +220,11 @@ class Router extends Register.inherits() {
 			return Promise.all(_g);
 		});
 	}
-	listContents(search) {
-		if (search == null) {
-			search = "/";
+	listContents(pattern) {
+		if (pattern == null) {
+			pattern = "**";
 		};
-		return this.find(search).then(function (files) {
+		return this.get(pattern).then(function (files) {
 			var result = new Array(files.length);
 			var _g = 0;
 			var _g1 = files.length;
@@ -222,6 +244,117 @@ 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.");
+		};
+	}
+	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;
+					};
+				};
+			};
+		};
+		return serveId;
+	}
 	static get __name__() {
 		return "whet.route.Router"
 	}

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

@@ -1,5 +1,5 @@
 import {StoneIdType} from "../magic/StoneId"
-import {RouteType} from "../magic/RouteType"
+import {RoutePathType} from "../magic/RoutePathType"
 import {MaybeArray} from "../magic/MaybeArray"
 import {CacheStrategy} from "../cache/Cache"
 import {Stone, AnyStone} from "../Stone"
@@ -11,7 +11,6 @@ export declare class JsonStone extends Stone<JsonStoneConfig> {
 	constructor(config: JsonStoneConfig)
 	data: {[key: string]: any}
 	addProjectData(): JsonStone
-	addMergeFiles(files: MaybeArray<RouteType>): JsonStone
 	protected generate(hash: SourceHash): Promise<SourceData[]>
 	protected generateHash(): Promise<SourceHash>
 	list(): Promise<string[]>
@@ -40,7 +39,7 @@ export type JsonStoneConfig = {
 	Defaults to the Stone's class name.
 	*/
 	id?: null | StoneIdType, 
-	mergeFiles?: null | MaybeArray<RouteType>, 
+	mergeFiles?: null | RoutePathType, 
 	name?: null | string, 
 	/**
 	Defaults to the last instanced project.

package/bin/whet/stones/JsonStone.js

@@ -1,5 +1,4 @@
-import {RouteType_Fields_} from "../magic/RouteType.js"
-import {MaybeArray_Fields_} from "../magic/MaybeArray.js"
+import {Router} from "../route/Router.js"
 import {Stone} from "../Stone.js"
 import {SourceHash} from "../SourceHash.js"
 import {SourceData} from "../Source.js"
@@ -23,10 +22,6 @@ class JsonStone extends Register.inherits(Stone) {
 		this.data["description"] = this.project.description;
 		return this;
 	}
-	addMergeFiles(files) {
-		this.config.mergeFiles = MaybeArray_Fields_.makeArray(this.config.mergeFiles).concat(MaybeArray_Fields_.makeArray(files));
-		return this;
-	}
 	generate(hash) {
 		var _gthis = this;
 		var obj = {};
@@ -37,28 +32,24 @@ class JsonStone extends Register.inherits(Stone) {
 			var key = _g_keys[_g_index++];
 			obj[key] = access[key];
 		};
-		var _this = MaybeArray_Fields_.makeArray(this.config.mergeFiles);
-		var result = new Array(_this.length);
-		var _g = 0;
-		var _g1 = _this.length;
-		while (_g < _g1) {
-			var i = _g++;
-			result[i] = RouteType_Fields_.makeRoute(_this[i]).getData();
-		};
-		return Promise.all(result).then(function (dataArr) {
+		return new Router(this.config.mergeFiles).get().then(function (list) {
+			var result = new Array(list.length);
+			var _g = 0;
+			var _g1 = list.length;
+			while (_g < _g1) {
+				var i = _g++;
+				result[i] = list[i].get();
+			};
+			return Promise.all(result);
+		}).then(function (dataArr) {
 			var _g = 0;
 			while (_g < dataArr.length) {
-				var data = dataArr[_g];
-				++_g;
-				var _g1 = 0;
-				while (_g1 < data.length) {
-					var file = JSON.parse(data[_g1++].data.toString());
-					var _g_keys = Reflect__1.fields(file);
-					var _g_index = 0;
-					while (_g_index < _g_keys.length) {
-						var key = _g_keys[_g_index++];
-						obj[key] = file[key];
-					};
+				var file = JSON.parse(dataArr[_g++].data.toString());
+				var _g_keys = Reflect__1.fields(file);
+				var _g_index = 0;
+				while (_g_index < _g_keys.length) {
+					var key = _g_keys[_g_index++];
+					obj[key] = file[key];
 				};
 			};
 			return [SourceData.fromString(_gthis.config.name, JSON.stringify(obj, null, "  "))];
@@ -66,27 +57,8 @@ class JsonStone extends Register.inherits(Stone) {
 	}
 	generateHash() {
 		var _gthis = this;
-		var _this = MaybeArray_Fields_.makeArray(this.config.mergeFiles);
-		var result = new Array(_this.length);
-		var _g = 0;
-		var _g1 = _this.length;
-		while (_g < _g1) {
-			var i = _g++;
-			var _this1 = RouteType_Fields_.makeRoute(_this[i]).routes;
-			var result1 = new Array(_this1.length);
-			var _g2 = 0;
-			var _g3 = _this1.length;
-			while (_g2 < _g3) {
-				var i1 = _g2++;
-				result1[i1] = _this1[i1].stone.getHash();
-			};
-			result[i] = Promise.all(result1).then(function (hashes) {
-				return SourceHash.merge(...hashes);
-			});
-		};
-		return Promise.all(result).then(function (hashes) {
-			hashes.push(SourceHash.fromString(JSON.stringify(_gthis.data)));
-			return SourceHash.merge(...hashes);
+		return new Router(this.config.mergeFiles).getHash().then(function (hash) {
+			return hash.add(SourceHash.fromString(JSON.stringify(_gthis.data)));
 		});
 	}
 	list() {
@@ -103,9 +75,6 @@ class JsonStone extends Register.inherits(Stone) {
 		if (this.config.name == null) {
 			this.config.name = "data.json";
 		};
-		if (this.config.mergeFiles == null) {
-			this.config.mergeFiles = [];
-		};
 		super.initConfig();
 	}
 	static get __name__() {

package/bin/whet/stones/Server.js

@@ -97,7 +97,7 @@ class Server extends Register.inherits(Stone) {
 				s = str;
 				id = (HxOverrides.cca(s, 0) == 47) ? s : "/" + s;
 			};
-			this.config.router.find(id).then(function (routeResult) {
+			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) {
 					if (source == null) {
 						res.writeHead(404, "File not found.");

package/bin/whet/stones/Zip.js

@@ -36,27 +36,7 @@ class ZipStone extends Register.inherits(Stone) {
 	}
 	generateHash() {
 		var _gthis = this;
-		var _this = new Router(this.config.sources).routes;
-		var result = new Array(_this.length);
-		var _g = 0;
-		var _g1 = _this.length;
-		while (_g < _g1) {
-			var i = _g++;
-			var _this1 = _this[i].route.routes;
-			var result1 = new Array(_this1.length);
-			var _g2 = 0;
-			var _g3 = _this1.length;
-			while (_g2 < _g3) {
-				var i1 = _g2++;
-				result1[i1] = _this1[i1].stone.getHash();
-			};
-			result[i] = Promise.all(result1).then(function (hashes) {
-				return SourceHash.merge(...hashes);
-			});
-		};
-		return Promise.all(result).then(function (hashes) {
-			return SourceHash.merge(...hashes);
-		}).then(function (hash) {
+		return new Router(this.config.sources).getHash().then(function (hash) {
 			return SourceHash.fromString(_gthis.config.filename + _gthis.config.level).add(hash);
 		});
 	}
@@ -64,7 +44,7 @@ class ZipStone extends Register.inherits(Stone) {
 		var _gthis = this;
 		Log.log(30, ...["Zipping files."]);
 		var level = this.config.level;
-		return new Router(this.config.sources).find("/").then(function (files) {
+		return new Router(this.config.sources).get().then(function (files) {
 			var _g = [];
 			var _g1 = 0;
 			while (_g1 < files.length) {

package/bin/whet.d.ts

@@ -7,7 +7,6 @@ export {Stone} from "./whet/Stone"
 export {ServerConfig} from "./whet/stones/Server"
 export {Server} from "./whet/stones/Server"
 export {Router} from "./whet/route/Router"
-export {Route} from "./whet/route/Route"
 export {RemoteFileConfig} from "./whet/stones/RemoteFile"
 export {RemoteFile} from "./whet/stones/RemoteFile"
 export {Project} from "./whet/Project"

package/bin/whet.js

@@ -11,7 +11,6 @@ export {Utils} from "./whet/Utils.js"
 export {Stone} from "./whet/Stone.js"
 export {Server} from "./whet/stones/Server.js"
 export {Router} from "./whet/route/Router.js"
-export {Route} from "./whet/route/Route.js"
 export {RemoteFile} from "./whet/stones/RemoteFile.js"
 export {Project} from "./whet/Project.js"
 export {Log} from "./whet/Log.js"

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "whet",
-    "version": "0.0.15",
+    "version": "0.0.16",
     "description": "NodeJS based assets management and project tooling library.",
     "scripts": {
         "devinit": "npx dts2hx commander --modular --noLibWrap",
@@ -24,9 +24,11 @@
     "homepage": "https://github.com/Antriel/whet#readme",
     "dependencies": {
         "commander": "^9.0.0",
-        "mime": "^3.0.0"
+        "mime": "^3.0.0",
+        "minimatch": "^5.1.0"
     },
     "devDependencies": {
+        "@types/minimatch": "^5.1.0",
         "dts2hx": "^0.18.1",
         "lix": "^15.11.6"
     }

package/bin/StringBuf.d.ts

@@ -1,13 +0,0 @@
-
-/**
-A String buffer is an efficient way to build a big string by appending small
-elements together.
-
-Unlike String, an instance of StringBuf is not immutable in the sense that
-it can be passed as argument to functions which modify it by appending more
-values.
-*/
-export declare class StringBuf {
-	constructor()
-	protected b: string
-}

package/bin/StringBuf.js

@@ -1,25 +0,0 @@
-import {Register} from "./genes/Register.js"
-
-const $global = Register.$global
-
-/**
-A String buffer is an efficient way to build a big string by appending small
-elements together.
-
-Unlike String, an instance of StringBuf is not immutable in the sense that
-it can be passed as argument to functions which modify it by appending more
-values.
-*/
-export const StringBuf = Register.global("$hxClasses")["StringBuf"] = 
-class StringBuf extends Register.inherits() {
-	new() {
-		this.b = "";
-	}
-	static get __name__() {
-		return "StringBuf"
-	}
-	get __class__() {
-		return StringBuf
-	}
-}
-