whet 0.0.6 → 0.0.9

package/bin/whet/stones/JsonStone.js

@@ -1,13 +1,13 @@
 import {RouteType_Fields_} from "../magic/RouteType.js"
 import {MaybeArray_Fields_} from "../magic/MaybeArray.js"
 import {Stone} from "../Stone.js"
-import {SourceId_Fields_} from "../SourceId.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
 
@@ -91,9 +91,13 @@ class JsonStone extends Register.inherits(Stone) {
 	}
 	list() {
 		var s = this.config.name;
-		s = Path.posix.normalize(s);
-		s = StringTools.replace(s, "\\", "/");
-		return Promise.resolve([(SourceId_Fields_.startsWithSlash(s)) ? s : "/" + s]);
+		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]);
 	}
 	initConfig() {
 		if (this.config.name == null) {

package/bin/whet/stones/RemoteFile.js

@@ -1,6 +1,5 @@
 import {CacheStrategy, CacheDurability} from "../cache/Cache.js"
 import {Stone} from "../Stone.js"
-import {SourceId_Fields_} from "../SourceId.js"
 import {SourceHash} from "../SourceHash.js"
 import {SourceData} from "../Source.js"
 import {Log} from "../Log.js"
@@ -10,6 +9,7 @@ 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
 
@@ -51,9 +51,13 @@ class RemoteFile extends Register.inherits(Stone) {
 	}
 	getId() {
 		var s = Path.basename(new URL(this.config.url).pathname);
-		s = Path.posix.normalize(s);
-		s = StringTools.replace(s, "\\", "/");
-		return (SourceId_Fields_.startsWithSlash(s)) ? s : "/" + s;
+		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;
 	}
 	static get __name__() {
 		return "whet.stones.RemoteFile"

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

@@ -6,7 +6,6 @@ import {SourceHash} from "../SourceHash"
 import {SourceData} from "../Source"
 import {Project} from "../Project"
 import {IncomingMessage, ServerResponse} from "http"
-import {Command} from "commander"
 
 export declare class Server extends Stone<ServerConfig> {
 	constructor(config: ServerConfig)
@@ -20,7 +19,7 @@ export declare class Server extends Stone<ServerConfig> {
 	*/
 	serve(): void
 	protected initConfig(): void
-	protected getCommands(): Command[]
+	protected addCommands(): void
 	protected handler(req: IncomingMessage, res: ServerResponse): void
 }
 

package/bin/whet/stones/Server.js

@@ -1,13 +1,12 @@
 import {Stone} from "../Stone.js"
-import {SourceId_Fields_} from "../SourceId.js"
 import {Log} from "../Log.js"
 import * as Path from "path"
 import Mime from "mime"
 import * as Http from "http"
 import {Register} from "../../genes/Register.js"
-import {Command} from "commander"
 import {StringTools} from "../../StringTools.js"
 import {Std} from "../../Std.js"
+import {HxOverrides} from "../../HxOverrides.js"
 
 const $global = Register.$global
 
@@ -42,36 +41,61 @@ class Server extends Register.inherits(Stone) {
 			this.config.port = 7000;
 		};
 	}
-	getCommands() {
+	addCommands() {
 		var _gthis = this;
-		return [new Command("serve").option("-p, --port <port>", "server port", "" + this.config.port).action(function (...args) {
+		this.project.addCommand("serve", this).option("-p, --port <port>", "server port", "" + this.config.port).action(function (...args) {
 			if (args[0].port != null) {
 				_gthis.config.port = Std.parseInt(args[0].port);
 			};
 			_gthis.serve();
 			return null;
-		})];
+		});
 	}
 	handler(req, res) {
 		var _gthis = this;
 		Log.log(30, ...["Handling request.", {"url": req.url, "method": req.method}]);
-		var s = req.url;
-		s = Path.posix.normalize(s);
-		s = StringTools.replace(s, "\\", "/");
-		var id = (SourceId_Fields_.startsWithSlash(s)) ? s : "/" + s;
+		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;
+		};
 		if (req.method == "GET") {
-			if (SourceId_Fields_.endsWithSlash(id)) {
+			if (HxOverrides.cca(id, id.length - 1) == 47) {
 				if ("index.html".length > 0) {
 					var s = id.substring(0, id.lastIndexOf("/") + 1);
-					s = Path.posix.normalize(s);
-					s = StringTools.replace(s, "\\", "/");
-					id = ((SourceId_Fields_.startsWithSlash(s)) ? s : "/" + s) + "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) + "index.html";
 				};
 			} else if (Path.posix.extname(id) == "") {
 				var s = "" + id + "/index.html";
-				s = Path.posix.normalize(s);
-				s = StringTools.replace(s, "\\", "/");
-				id = (SourceId_Fields_.startsWithSlash(s)) ? s : "/" + s;
+				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;
 			};
 			this.config.router.find(id).then(function (routeResult) {
 				var sourcePromise = (routeResult.length > 0) ? routeResult[0].get() : (_gthis.routeDynamic != null) ? _gthis.routeDynamic(id) : null;

package/bin/whet/stones/Zip.js

@@ -1,7 +1,6 @@
 import {Router} from "../route/Router.js"
 import {CacheStrategy, CacheDurability, DurabilityCheck} from "../cache/Cache.js"
 import {Stone} from "../Stone.js"
-import {SourceId_Fields_} from "../SourceId.js"
 import {SourceHash} from "../SourceHash.js"
 import {SourceData} from "../Source.js"
 import {Log} from "../Log.js"
@@ -15,6 +14,7 @@ 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
 
@@ -75,9 +75,13 @@ class ZipStone extends Register.inherits(Stone) {
 						var bytes = Helper.bytesOfBuffer(data.data);
 						var this1 = file[0].serveId;
 						var s = "/";
-						s = Path.posix.normalize("/");
-						s = StringTools.replace(s, "\\", "/");
-						var root = (SourceId_Fields_.startsWithSlash(s)) ? s : "/" + 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.");
 						};
@@ -99,9 +103,13 @@ class ZipStone extends Register.inherits(Stone) {
 	}
 	list() {
 		var s = this.config.filename;
-		s = Path.posix.normalize(s);
-		s = StringTools.replace(s, "\\", "/");
-		return Promise.resolve([(SourceId_Fields_.startsWithSlash(s)) ? s : "/" + s]);
+		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]);
 	}
 	static get __name__() {
 		return "whet.stones.ZipStone"

package/bin/whet/stones/haxe/HaxeBuild.d.ts

@@ -5,7 +5,6 @@ import {Stone} from "../../Stone"
 import {SourceHash} from "../../SourceHash"
 import {SourceData} from "../../Source"
 import {Project} from "../../Project"
-import {Command} from "commander"
 
 export declare class HaxeBuild extends Stone<BuildConfig> {
 	constructor(config: BuildConfig)
@@ -16,7 +15,7 @@ export declare class HaxeBuild extends Stone<BuildConfig> {
 	*/
 	build(): Promise<any>
 	protected generate(hash: SourceHash): Promise<SourceData[]>
-	protected getCommands(): Command[]
+	protected addCommands(): void
 	list(): Promise<string[]>
 	protected generateHash(): Promise<SourceHash>
 }

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

@@ -1,15 +1,15 @@
 import {MaybeArray_Fields_} from "../../magic/MaybeArray.js"
 import {Utils} from "../../Utils.js"
 import {Stone} from "../../Stone.js"
-import {SourceId_Fields_, RootDir} from "../../SourceId.js"
+import {RootDir} 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 {Command} from "commander"
 import * as ChildProcess from "child_process"
 import {StringTools} from "../../../StringTools.js"
+import {HxOverrides} from "../../../HxOverrides.js"
 
 const $global = Register.$global
 
@@ -34,9 +34,13 @@ class HaxeBuild extends Register.inherits(Stone) {
 			var cwd = process.cwd();
 			var this1 = _gthis.project.rootDir;
 			var s = "/";
-			s = Path.posix.normalize("/");
-			s = StringTools.replace(s, "\\", "/");
-			var root = (SourceId_Fields_.startsWithSlash(s)) ? s : "/" + 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.");
 			};
@@ -57,8 +61,10 @@ class HaxeBuild extends Register.inherits(Stone) {
 			};
 			ChildProcess.exec(result.join(" "), {"cwd": cwd1, "windowsHide": true}, function (err, stdout, stderr) {
 				if (err != null) {
+					Log.log(30, ...["Haxe build failed."]);
 					rej(err);
 				} else {
+					Log.log(30, ...["Haxe build successful."]);
 					res(null);
 				};
 			});
@@ -84,11 +90,11 @@ class HaxeBuild extends Register.inherits(Stone) {
 			throw new Error("Cannot get source of a multi-file build. Not implemented yet.");
 		};
 	}
-	getCommands() {
+	addCommands() {
 		var _gthis = this;
-		return [new Command("build").action(function (..._) {
+		this.project.addCommand("build", this).action(function (..._) {
 			return _gthis.build();
-		})];
+		});
 	}
 	list() {
 		if (this.config.hxml.isSingleFile()) {
@@ -105,9 +111,13 @@ class HaxeBuild extends Register.inherits(Stone) {
 		while (_g < _g1) {
 			var i = _g++;
 			var s = _this[i];
-			s = Path.posix.normalize(s);
-			s = StringTools.replace(s, "\\", "/");
-			var this1 = (SourceId_Fields_.startsWithSlash(s)) ? s : "/" + s;
+			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.");

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

@@ -3,7 +3,7 @@ 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, SourceId_Fields_} from "../../SourceId.js"
+import {SourceId} from "../../SourceId.js"
 import {SourceHash} from "../../SourceHash.js"
 import {SourceData} from "../../Source.js"
 import {Log} from "../../Log.js"
@@ -149,14 +149,22 @@ class Hxml extends Register.inherits(Stone) {
 			var filename;
 			if (this.build.config.filename != null) {
 				var s = this.build.config.filename;
-				s = Path.posix.normalize(s);
-				s = StringTools.replace(s, "\\", "/");
-				filename = (SourceId_Fields_.startsWithSlash(s)) ? s : "/" + s;
+				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";
-				s = Path.posix.normalize("build");
-				s = StringTools.replace(s, "\\", "/");
-				filename = (SourceId_Fields_.startsWithSlash(s)) ? s : "/" + s;
+				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;
 			};
 			if (Path.posix.extname(filename) == "") {
 				var v = this.getBuildExtension();
@@ -164,9 +172,13 @@ class Hxml extends Register.inherits(Stone) {
 					v = "." + v;
 				};
 				var s = filename.substring(0, filename.lastIndexOf("/") + 1);
-				s = Path.posix.normalize(s);
-				s = StringTools.replace(s, "\\", "/");
-				filename = ((SourceId_Fields_.startsWithSlash(s)) ? s : "/" + s) + Path.posix.parse(filename.substring(filename.lastIndexOf("/"))).name + v;
+				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;
 			};
 			return filename;
 		} else {
@@ -176,9 +188,13 @@ class Hxml extends Register.inherits(Stone) {
 	getPlatform() {
 		var this1 = this.getBuildExportPath();
 		var s = "/";
-		s = Path.posix.normalize("/");
-		s = StringTools.replace(s, "\\", "/");
-		var root = (SourceId_Fields_.startsWithSlash(s)) ? s : "/" + 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.");
 		};
@@ -282,18 +298,26 @@ class Hxml extends Register.inherits(Stone) {
 	}
 	filename() {
 		var s = this.id;
-		s = Path.posix.normalize(s);
-		s = StringTools.replace(s, "\\", "/");
-		var fn = (SourceId_Fields_.startsWithSlash(s)) ? s : "/" + s;
+		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;
 		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);
-			s = Path.posix.normalize(s);
-			s = StringTools.replace(s, "\\", "/");
-			fn = ((SourceId_Fields_.startsWithSlash(s)) ? s : "/" + s) + Path.posix.parse(fn.substring(fn.lastIndexOf("/"))).name + v;
+			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;
+			fn = ((HxOverrides.cca(s, 0) == 47) ? s : "/" + s) + Path.posix.parse(fn.substring(fn.lastIndexOf("/"))).name + v;
 		};
 		return fn;
 	}

package/bin/whet.d.ts

@@ -1,4 +1,5 @@
 
+export {addOption} from "./whet/Project"
 export {ZipStone} from "./whet/stones/Zip"
 export {ZipConfig} from "./whet/stones/Zip"
 export {Utils} from "./whet/Utils"

package/bin/whet.js

@@ -5,6 +5,7 @@ import {Register} from "./genes/Register.js"
 const $global = Register.$global
 
 Whet_Fields_.main()
+export {addOption} from "./whet/Project.js"
 export {ZipStone} from "./whet/stones/Zip.js"
 export {Utils} from "./whet/Utils.js"
 export {Stone} from "./whet/Stone.js"

package/package.json

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