whet 0.0.18 → 0.0.20

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
 
@@ -41,103 +38,26 @@ class Router extends Register.inherits() {
 			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 serveId1 = serveId;
-								if (serveId1 != null) {
-									arr.push(new RouteResult(serveId1, path, stone[0]));
-								};
-							};
-							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 result = 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, "\\", "/");
-												};
-												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;
-						};
-					})(route1));
-				} else {
-					throw new Error("Router source must be a Stone or a Router.");
-				};
-				_g.push(tmp.then((function (route) {
+				_g.push(_gthis.allFromRoute(route[0]).then((function (route) {
 					return function (list) {
-						var this1 = route[0].routeUnder;
-						var routeUnderIsDir = HxOverrides.cca(this1, this1.length - 1) == 47;
+						var id = route[0].routeUnder;
+						var routeUnderIsDir = id.length == 0 || id.charCodeAt(id.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;
+							var tmp;
+							if (routeUnderIsDir) {
+								var id = item.serveId;
+								var dir = route[0].routeUnder;
+								if (!(dir.length == 0 || dir.charCodeAt(dir.length - 1) == 47)) {
+									throw new Error("\"" + dir + "\" is not a directory.");
+								};
+								tmp = Path.posix.join(dir, id);
+							} else {
+								tmp = route[0].routeUnder;
+							};
+							item.serveId = tmp;
 							if (filter.match(item.serveId)) {
 								result.push(item);
 							};
@@ -197,20 +117,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);
@@ -261,14 +168,14 @@ class Router extends Register.inherits() {
 							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, "\\", "/");
+									var directory = dir + "/";
+									if (!(directory.length == 0 || directory.charCodeAt(directory.length - 1) == 47)) {
+										throw new Error("\"" + directory + "\" is not a directory.");
 									};
-									s = str;
-									serveId = SourceId.relativeTo(path, (HxOverrides.cca(s, 0) == 47) ? s : "/" + s);
+									var serveId1;
+									var dir1 = path.substring(0, path.lastIndexOf("/") + 1);
+									serveId1 = ((dir1.length == 0) ? "./" : dir1).indexOf(directory) == 0;
+									serveId = (serveId1) ? path.substring(directory.length) : null;
 									break;
 								};
 								if (!(dir.length > 0)) {
@@ -277,9 +184,9 @@ class Router extends Register.inherits() {
 							};
 						};
 					};
-					var serveId1 = serveId;
-					if (serveId1 != null) {
-						arr.push(new RouteResult(serveId1, path, stone));
+					var serveId2 = serveId;
+					if (serveId2 != null) {
+						arr.push(new RouteResult(serveId2, path, stone));
 					};
 				};
 				return arr;
@@ -300,14 +207,14 @@ class Router extends Register.inherits() {
 							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, "\\", "/");
+									var directory = dir + "/";
+									if (!(directory.length == 0 || directory.charCodeAt(directory.length - 1) == 47)) {
+										throw new Error("\"" + directory + "\" is not a directory.");
 									};
-									s = str;
-									serveId = SourceId.relativeTo(path, (HxOverrides.cca(s, 0) == 47) ? s : "/" + s);
+									var serveId1;
+									var dir1 = path.substring(0, path.lastIndexOf("/") + 1);
+									serveId1 = ((dir1.length == 0) ? "./" : dir1).indexOf(directory) == 0;
+									serveId = (serveId1) ? path.substring(directory.length) : null;
 									break;
 								};
 								if (!(dir.length > 0)) {
@@ -316,9 +223,9 @@ class Router extends Register.inherits() {
 							};
 						};
 					};
-					var serveId1 = serveId;
-					if (serveId1 != null) {
-						result.serveId = serveId1;
+					var serveId2 = serveId;
+					if (serveId2 != null) {
+						result.serveId = serveId2;
 						arr.push(result);
 					};
 				};
@@ -337,14 +244,14 @@ class Router extends Register.inherits() {
 				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, "\\", "/");
+						var directory = dir + "/";
+						if (!(directory.length == 0 || directory.charCodeAt(directory.length - 1) == 47)) {
+							throw new Error("\"" + directory + "\" is not a directory.");
 						};
-						s = str;
-						serveId = SourceId.relativeTo(path, (HxOverrides.cca(s, 0) == 47) ? s : "/" + s);
+						var serveId1;
+						var dir1 = path.substring(0, path.lastIndexOf("/") + 1);
+						serveId1 = ((dir1.length == 0) ? "./" : dir1).indexOf(directory) == 0;
+						serveId = (serveId1) ? path.substring(directory.length) : null;
 						break;
 					};
 					if (!(dir.length > 0)) {

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

@@ -9,6 +9,7 @@ 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[]>
 }
 

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,39 +15,73 @@ 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];
+			var path = [_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, "\\", "/");
+			if (path[0].length == 0 || path[0].charCodeAt(path[0].length - 1) == 47) {
+				_g.push(Utils.listDirectoryFiles(this.cwdPath(path[0]), this.config.recursive).then((function (path) {
+					return function (arr) {
+						var result = new Array(arr.length);
+						var _g = 0;
+						var _g1 = arr.length;
+						while (_g < _g1) {
+							var i = _g++;
+							var pathId = IdUtils.fromCwdPath(arr[i], RootDir.fromProject(_gthis.project));
+							if (!(path[0].length == 0 || path[0].charCodeAt(path[0].length - 1) == 47)) {
+								throw new Error("\"" + path[0] + "\" is not a directory.");
+							};
+							var tmp;
+							var dir = pathId.substring(0, pathId.lastIndexOf("/") + 1);
+							tmp = ((dir.length == 0) ? "./" : dir).indexOf(path[0]) == 0;
+							result[i] = (tmp) ? pathId.substring(path[0].length) : null;
+						};
+						return result;
+					};
+				})(path)));
+			} else {
+				var id = path[0];
+				_g.push(Promise.resolve([id.substring(id.lastIndexOf("/") + 1)]));
+			};
+		};
+		return Promise.all(_g).then(function (allPaths) {
+			var _g = [];
+			var _g_current = 0;
+			while (_g_current < allPaths.length) {
+				var x = Register.iter(allPaths[_g_current++]);
+				while (x.hasNext()) _g.push(x.next());
 			};
-			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) {
+			return _g;
+		});
+	}
+	generate(hash) {
+		var _gthis = this;
+		var _g = [];
+		var _g1 = 0;
+		var _g2 = MaybeArray_Fields_.makeArray(this.config.paths);
+		while (_g1 < _g2.length) {
+			var path = [_g2[_g1]];
+			++_g1;
+			if (path[0].length == 0 || path[0].charCodeAt(path[0].length - 1) == 47) {
+				_g.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, "\\", "/");
+							var pathId = IdUtils.fromCwdPath(file, RootDir.fromProject(_gthis.project));
+							if (!(path[0].length == 0 || path[0].charCodeAt(path[0].length - 1) == 47)) {
+								throw new Error("\"" + path[0] + "\" is not a directory.");
 							};
-							s = str;
-							var pathId = (HxOverrides.cca(s, 0) == 47) ? s : "/" + s;
-							_g.push(SourceData.fromFile(SourceId.relativeTo(pathId, path[0]), file, pathId));
+							var id;
+							var dir = pathId.substring(0, pathId.lastIndexOf("/") + 1);
+							id = ((dir.length == 0) ? "./" : dir).indexOf(path[0]) == 0;
+							_g.push(SourceData.fromFile((id) ? pathId.substring(path[0].length) : null, file, pathId));
 						};
 						return _g;
 					};
@@ -60,7 +91,8 @@ class Files extends Register.inherits(Stone) {
 					};
 				})()));
 			} else {
-				_g.push(SourceData.fromFile(path[0].substring(path[0].lastIndexOf("/")), this.cwdPath(path[0]), path[0]).then((function () {
+				var id = path[0];
+				_g.push(SourceData.fromFile(id.substring(id.lastIndexOf("/") + 1), this.cwdPath(path[0]), path[0]).then((function () {
 					return function (src) {
 						return [src];
 					};

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.

package/bin/whet/stones/JsonStone.js

@@ -2,11 +2,8 @@ import {Router} from "../route/Router.js"
 import {Stone} from "../Stone.js"
 import {SourceHash} from "../SourceHash.js"
 import {SourceData} from "../Source.js"
-import * as Path from "path"
 import {Register} from "../../genes/Register.js"
-import {StringTools} from "../../StringTools.js"
 import {Reflect as Reflect__1} from "../../Reflect.js"
-import {HxOverrides} from "../../HxOverrides.js"
 
 const $global = Register.$global
 
@@ -32,7 +29,7 @@ class JsonStone extends Register.inherits(Stone) {
 			var key = _g_keys[_g_index++];
 			obj[key] = access[key];
 		};
-		return new Router(this.config.mergeFiles).get().then(function (list) {
+		return this.config.mergeFiles.get().then(function (list) {
 			var result = new Array(list.length);
 			var _g = 0;
 			var _g1 = list.length;
@@ -57,24 +54,20 @@ class JsonStone extends Register.inherits(Stone) {
 	}
 	generateHash() {
 		var _gthis = this;
-		return new Router(this.config.mergeFiles).getHash().then(function (hash) {
+		return this.config.mergeFiles.getHash().then(function (hash) {
 			return hash.add(SourceHash.fromString(JSON.stringify(_gthis.data)));
 		});
 	}
 	list() {
-		var s = this.config.name;
-		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;
-		return Promise.resolve([(HxOverrides.cca(s, 0) == 47) ? s : "/" + s]);
+		return Promise.resolve([this.config.name]);
 	}
 	initConfig() {
 		if (this.config.name == null) {
 			this.config.name = "data.json";
 		};
+		if (this.config.mergeFiles == null) {
+			this.config.mergeFiles = new Router();
+		};
 		super.initConfig();
 	}
 	static get __name__() {

package/bin/whet/stones/RemoteFile.js

@@ -8,8 +8,6 @@ import * as Path from "path"
 import * as Https from "https"
 import {Register} from "../../genes/Register.js"
 import {Buffer} from "buffer"
-import {StringTools} from "../../StringTools.js"
-import {HxOverrides} from "../../HxOverrides.js"
 
 const $global = Register.$global
 
@@ -50,14 +48,7 @@ class RemoteFile extends Register.inherits(Stone) {
 		return Promise.resolve(SourceHash.fromString(this.config.url));
 	}
 	getId() {
-		var s = Path.basename(new URL(this.config.url).pathname);
-		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;
-		return (HxOverrides.cca(s, 0) == 47) ? s : "/" + s;
+		return Path.basename(new URL(this.config.url).pathname);
 	}
 	static get __name__() {
 		return "whet.stones.RemoteFile"

package/bin/whet/stones/Server.js

@@ -5,10 +5,8 @@ import * as Path from "path"
 import Mime from "mime"
 import * as Http from "http"
 import {Register} from "../../genes/Register.js"
-import {StringTools} from "../../StringTools.js"
 import {Std} from "../../Std.js"
 import {Reflect as Reflect__1} from "../../Reflect.js"
-import {HxOverrides} from "../../HxOverrides.js"
 
 const $global = Register.$global
 
@@ -57,48 +55,18 @@ class Server extends Register.inherits(Stone) {
 		var _gthis = this;
 		Log.log(30, ...["Handling request.", {"url": req.url, "method": req.method}]);
 		var searchIndex = req.url.indexOf("?");
-		var id;
-		if (searchIndex > 0) {
-			var s = req.url.substring(0, searchIndex);
-			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;
-			id = (HxOverrides.cca(s, 0) == 47) ? s : "/" + s;
-		} else {
-			var s = req.url;
-			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;
-			id = (HxOverrides.cca(s, 0) == 47) ? s : "/" + s;
+		var id = decodeURI((searchIndex > 0 ? req.url.substring(0,searchIndex) : req.url));
+		if (id.charCodeAt(0) == 47) {
+			id = id.substring(1);
 		};
 		switch (req.method) {
 			case "GET":
-				if (HxOverrides.cca(id, id.length - 1) == 47) {
-					if ("index.html".length > 0) {
-						var s = id.substring(0, id.lastIndexOf("/") + 1);
-						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;
-						id = ((HxOverrides.cca(s, 0) == 47) ? s : "/" + s) + "index.html";
-					};
+				if (id.length == 0 || id.charCodeAt(id.length - 1) == 47) {
+					var id1 = id;
+					var dir = id1.substring(0, id1.lastIndexOf("/") + 1);
+					id = Path.posix.join((dir.length == 0) ? "./" : dir, "index.html");
 				} else if (Path.posix.extname(id) == "") {
-					var s = "" + id + "/index.html";
-					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;
-					id = (HxOverrides.cca(s, 0) == 47) ? s : "/" + s;
+					id = "" + id + "/index.html";
 				};
 				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) {
@@ -146,18 +114,7 @@ class Server extends Register.inherits(Stone) {
 				res.end();
 				break
 			case "PUT":
-				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 (id.charAt(0) != "/") {
-					throw new Error("Badly formed SourceId.");
-				};
-				var cmd = [Path.posix.join(".", root, ".", id)];
+				var cmd = [Path.posix.join(".", "./", ".", id)];
 				var body = "";
 				req.on("data", function (chunk) {
 					body += chunk;

package/bin/whet/stones/Zip.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"
@@ -43,5 +43,5 @@ export type ZipConfig = {
 	Defaults to the last instanced project.
 	*/
 	project?: null | Project, 
-	sources: RoutePathType
+	sources: Router
 }

package/bin/whet/stones/Zip.js

@@ -1,4 +1,3 @@
-import {Router} from "../route/Router.js"
 import {CacheStrategy, CacheDurability, DurabilityCheck} from "../cache/Cache.js"
 import {Stone} from "../Stone.js"
 import {SourceHash} from "../SourceHash.js"
@@ -12,9 +11,7 @@ import {BytesOutput} from "../../haxe/io/BytesOutput.js"
 import {Crc32} from "../../haxe/crypto/Crc32.js"
 import {Register} from "../../genes/Register.js"
 import {Buffer} from "buffer"
-import {StringTools} from "../../StringTools.js"
 import {Lambda} from "../../Lambda.js"
-import {HxOverrides} from "../../HxOverrides.js"
 
 const $global = Register.$global
 
@@ -36,7 +33,7 @@ class ZipStone extends Register.inherits(Stone) {
 	}
 	generateHash() {
 		var _gthis = this;
-		return new Router(this.config.sources).getHash().then(function (hash) {
+		return this.config.sources.getHash().then(function (hash) {
 			return SourceHash.fromString(_gthis.config.filename + _gthis.config.level).add(hash);
 		});
 	}
@@ -44,7 +41,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).get().then(function (files) {
+		return this.config.sources.get().then(function (files) {
 			var _g = [];
 			var _g1 = 0;
 			while (_g1 < files.length) {
@@ -53,19 +50,7 @@ class ZipStone extends Register.inherits(Stone) {
 				_g.push(file[0].get().then((function (file) {
 					return function (data) {
 						var bytes = Helper.bytesOfBuffer(data.data);
-						var this1 = file[0].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 entry = {"fileName": Path.posix.join(".", root, ".", this1), "fileSize": data.data.length, "fileTime": new Date(data.source.ctime * 1000), "compressed": false, "dataSize": data.data.length, "data": bytes, "crc32": Crc32.make(bytes)};
+						var entry = {"fileName": Path.posix.join(".", "./", ".", file[0].serveId), "fileSize": data.data.length, "fileTime": new Date(data.source.ctime * 1000), "compressed": false, "dataSize": data.data.length, "data": bytes, "crc32": Crc32.make(bytes)};
 						Tools.compress(entry, level);
 						return entry;
 					};
@@ -82,14 +67,7 @@ class ZipStone extends Register.inherits(Stone) {
 		});
 	}
 	list() {
-		var s = this.config.filename;
-		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;
-		return Promise.resolve([(HxOverrides.cca(s, 0) == 47) ? s : "/" + s]);
+		return Promise.resolve([this.config.filename]);
 	}
 	static get __name__() {
 		return "whet.stones.ZipStone"