whet 0.0.19 → 0.0.21

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
 
@@ -58,28 +56,17 @@ class Server extends Register.inherits(Stone) {
 		Log.log(30, ...["Handling request.", {"url": req.url, "method": req.method}]);
 		var searchIndex = req.url.indexOf("?");
 		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) {
@@ -127,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"

package/bin/whet/stones/haxe/HaxeBuild.js

@@ -9,7 +9,6 @@ import * as Path from "path"
 import {Register} from "../../../genes/Register.js"
 import * as ChildProcess from "child_process"
 import {StringTools} from "../../../StringTools.js"
-import {HxOverrides} from "../../../HxOverrides.js"
 
 const $global = Register.$global
 
@@ -31,20 +30,7 @@ class HaxeBuild extends Register.inherits(Stone) {
 		var _gthis = this;
 		Log.log(30, ...["Building Haxe project."]);
 		return new Promise(function (res, rej) {
-			var cwd = process.cwd();
-			var this1 = _gthis.project.rootDir;
-			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 cwd1 = Path.join(cwd, Path.posix.join(".", root, ".", this1));
+			var cwd = Path.join(process.cwd(), Path.posix.join(".", "./", ".", _gthis.project.rootDir));
 			var _g = [];
 			var e = Register.iter(_gthis.config.hxml.getBuildArgs());
 			while (e.hasNext()) {
@@ -59,7 +45,7 @@ class HaxeBuild extends Register.inherits(Stone) {
 				var i = _g1++;
 				result[i] = StringTools.replace(_g[i], "\"", "\\\"");
 			};
-			ChildProcess.exec(result.join(" "), {"cwd": cwd1, "windowsHide": true}, function (err, stdout, stderr) {
+			ChildProcess.exec(result.join(" "), {"cwd": cwd, "windowsHide": true}, function (err, stdout, stderr) {
 				if (err != null) {
 					var haxeError = new Error(stderr);
 					haxeError.name = "Haxe Build Error";
@@ -75,15 +61,12 @@ class HaxeBuild extends Register.inherits(Stone) {
 		var _gthis = this;
 		if (this.config.hxml.isSingleFile()) {
 			var pathId = this.config.hxml.getBuildExportPath();
-			var root = RootDir.fromProject(this.project);
-			if (pathId.charAt(0) != "/") {
-				throw new Error("Badly formed SourceId.");
-			};
-			var path = Path.posix.join(".", root, ".", pathId);
+			var path = Path.posix.join(".", RootDir.fromProject(this.project), ".", pathId);
 			return Utils.deleteAll(path).then(function (_) {
 				return _gthis.build();
 			}).then(function (_) {
-				return SourceData.fromFile(pathId.substring(pathId.lastIndexOf("/")), path, pathId).then(function (file) {
+				var id = pathId;
+				return SourceData.fromFile(id.substring(id.lastIndexOf("/") + 1), path, pathId).then(function (file) {
 					return [file];
 				});
 			});
@@ -111,19 +94,7 @@ class HaxeBuild extends Register.inherits(Stone) {
 		var _g1 = _this.length;
 		while (_g < _g1) {
 			var i = _g++;
-			var s = _this[i];
-			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 this1 = (HxOverrides.cca(s, 0) == 47) ? s : "/" + s;
-			var root = RootDir.fromProject(this.config.hxml.project);
-			if (this1.charAt(0) != "/") {
-				throw new Error("Badly formed SourceId.");
-			};
-			result[i] = Path.posix.join(".", root, ".", this1);
+			result[i] = Path.posix.join(".", RootDir.fromProject(this.config.hxml.project), ".", _this[i]);
 		};
 		return Promise.all([this.config.hxml.getHash(), SourceHash.fromFiles(result)]).then(function (r) {
 			return SourceHash.merge(...r);

package/bin/whet/stones/haxe/Hxml.js

@@ -3,14 +3,11 @@ import {StoneId_Fields_} from "../../magic/StoneId.js"
 import {MaybeArray_Fields_} from "../../magic/MaybeArray.js"
 import {CacheStrategy, CacheDurability} from "../../cache/Cache.js"
 import {Stone} from "../../Stone.js"
-import {SourceId} from "../../SourceId.js"
 import {SourceHash} from "../../SourceHash.js"
 import {SourceData} from "../../Source.js"
 import {Log} from "../../Log.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
 
@@ -139,46 +136,26 @@ class Hxml extends Register.inherits(Stone) {
 	getBuildExportPath() {
 		var dir = this.project.cache.getDir(this.build, this.generateHashSync());
 		if (this.isSingleFile()) {
-			return SourceId.getPutInDir(this.getBuildFilename(), dir);
+			var id = this.getBuildFilename();
+			if (!(dir.length == 0 || dir.charCodeAt(dir.length - 1) == 47)) {
+				throw new Error("\"" + dir + "\" is not a directory.");
+			};
+			return Path.posix.join(dir, id);
 		} else {
 			return dir;
 		};
 	}
 	getBuildFilename() {
 		if (this.isSingleFile()) {
-			var filename;
-			if (this.build.config.filename != null) {
-				var s = this.build.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;
-				filename = (HxOverrides.cca(s, 0) == 47) ? s : "/" + s;
-			} else {
-				var s = "build";
-				var str = ("build".length > 1 && HxOverrides.cca("build", 0) == 47) ? "build".substring(1) : "build";
-				if (str.length > 0) {
-					str = Path.posix.normalize(str);
-					str = StringTools.replace(str, "\\", "/");
-				};
-				s = str;
-				filename = (HxOverrides.cca(s, 0) == 47) ? s : "/" + s;
-			};
+			var filename = (this.build.config.filename != null) ? this.build.config.filename : "build";
 			if (Path.posix.extname(filename) == "") {
-				var v = this.getBuildExtension();
-				if (v.length > 0 && HxOverrides.cca(v, 0) != 46) {
-					v = "." + v;
+				var id = filename;
+				var ext = this.getBuildExtension();
+				if (ext.length > 0 && ext.charCodeAt(0) != 46) {
+					ext = "." + ext;
 				};
-				var s = filename.substring(0, filename.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;
-				filename = ((HxOverrides.cca(s, 0) == 47) ? s : "/" + s) + Path.posix.parse(filename.substring(filename.lastIndexOf("/"))).name + v;
+				var dir = id.substring(0, id.lastIndexOf("/") + 1);
+				filename = Path.posix.join((dir.length == 0) ? "./" : dir, Path.posix.parse(id).name) + ext;
 			};
 			return filename;
 		} else {
@@ -186,19 +163,8 @@ class Hxml extends Register.inherits(Stone) {
 		};
 	}
 	getPlatform() {
-		var this1 = this.getBuildExportPath();
-		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 path = Path.posix.join(".", root, ".", this1);
+		var id = this.getBuildExportPath();
+		var path = Path.posix.join(".", "./", ".", id);
 		var _g = this.config.platform;
 		if (_g == null) {
 			return [];
@@ -297,27 +263,15 @@ class Hxml extends Register.inherits(Stone) {
 		return Promise.resolve([this.filename()]);
 	}
 	filename() {
-		var s = this.id;
-		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 fn = (HxOverrides.cca(s, 0) == 47) ? s : "/" + s;
+		var fn = this.id;
 		if (Path.posix.extname(fn) == "") {
-			var v = "hxml";
-			if ("hxml".length > 0 && HxOverrides.cca("hxml", 0) != 46) {
-				v = "." + "hxml";
-			};
-			var s = fn.substring(0, fn.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, "\\", "/");
+			var id = fn;
+			var ext = "hxml";
+			if ("hxml".length > 0 && ext.charCodeAt(0) != 46) {
+				ext = "." + ext;
 			};
-			s = str;
-			fn = ((HxOverrides.cca(s, 0) == 47) ? s : "/" + s) + Path.posix.parse(fn.substring(fn.lastIndexOf("/"))).name + v;
+			var dir = id.substring(0, id.lastIndexOf("/") + 1);
+			fn = Path.posix.join((dir.length == 0) ? "./" : dir, Path.posix.parse(id).name) + ext;
 		};
 		return fn;
 	}

package/bin/whet.d.ts

@@ -13,6 +13,7 @@ export {Project} from "./whet/Project"
 export {Log} from "./whet/Log"
 export {JsonStoneConfig} from "./whet/stones/JsonStone"
 export {JsonStone} from "./whet/stones/JsonStone"
+export {IdUtils} from "./whet/SourceId"
 export {HxmlConfig} from "./whet/stones/haxe/Hxml"
 export {Hxml} from "./whet/stones/haxe/Hxml"
 export {HaxeBuild} from "./whet/stones/haxe/HaxeBuild"

package/bin/whet.js

@@ -15,6 +15,7 @@ export {RemoteFile} from "./whet/stones/RemoteFile.js"
 export {Project} from "./whet/Project.js"
 export {Log} from "./whet/Log.js"
 export {JsonStone} from "./whet/stones/JsonStone.js"
+export {IdUtils} from "./whet/SourceId.js"
 export {Hxml} from "./whet/stones/haxe/Hxml.js"
 export {HaxeBuild} from "./whet/stones/haxe/HaxeBuild.js"
 export {Files} from "./whet/stones/Files.js"

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "whet",
-    "version": "0.0.19",
+    "version": "0.0.21",
     "description": "NodeJS based assets management and project tooling library.",
     "scripts": {
         "devinit": "npx dts2hx commander pino-pretty --modular --noLibWrap",