whet 0.0.6 → 0.0.7

package/bin/whet/Project.d.ts

@@ -12,7 +12,7 @@ export declare class Project {
 	stones: AnyStone[]
 	onInit: (config: any) => Promise<any>
 	protected options: Option[]
-	addCommand(cmd: Command, stone?: null | AnyStone): void
+	addCommand(name: string, stone?: null | AnyStone): Command
 	toString(): string
 	protected static projects: Project[]
 }
@@ -27,8 +27,10 @@ export type ProjectConfig = {
 	*/
 	onInit?: null | ((config: any) => Promise<any>), 
 	/**
-	* Array of Commander.js options this project supports.
+	* Array of Commander.js options this project supports. Use `addOption` to get Option instance.
 	*/
 	options?: null | Option[], 
 	rootDir?: null | string
 }
+
+export const addOption: (flags: string, description: null | string) => Option

package/bin/whet/Project.js

@@ -4,7 +4,9 @@ import {SourceId_Fields_} from "./SourceId.js"
 import {Log} from "./Log.js"
 import * as Path from "path"
 import {Register} from "../genes/Register.js"
+import {Command, Option} from "commander"
 import {StringTools} from "../StringTools.js"
+import {HxOverrides} from "../HxOverrides.js"
 
 const $global = Register.$global
 
@@ -37,16 +39,16 @@ class Project extends Register.inherits() {
 			file = decodeURI(file);
 			file = StringTools.replace(file, "file:///", "");
 			var s = Path.relative(process.cwd(), file);
-			s = Path.posix.normalize(s);
+			s = Path.posix.normalize((s.length > 1 && SourceId_Fields_.startsWithSlash(s)) ? HxOverrides.substr(s, 1, null) : s);
 			s = StringTools.replace(s, "\\", "/");
 			var this1 = (SourceId_Fields_.startsWithSlash(s)) ? s : "/" + s;
 			var s = this1.substring(0, this1.lastIndexOf("/") + 1);
-			s = Path.posix.normalize(s);
+			s = Path.posix.normalize((s.length > 1 && SourceId_Fields_.startsWithSlash(s)) ? HxOverrides.substr(s, 1, null) : s);
 			s = StringTools.replace(s, "\\", "/");
 			this.rootDir = (SourceId_Fields_.startsWithSlash(s)) ? s : "/" + s;
 		} else {
 			var s = config.rootDir;
-			s = Path.posix.normalize(s);
+			s = Path.posix.normalize((s.length > 1 && SourceId_Fields_.startsWithSlash(s)) ? HxOverrides.substr(s, 1, null) : s);
 			s = StringTools.replace(s, "\\", "/");
 			this.rootDir = (SourceId_Fields_.startsWithSlash(s)) ? s : "/" + s;
 		};
@@ -55,11 +57,13 @@ class Project extends Register.inherits() {
 		var this1 = ["New project created.", {"project": this, "projectCount": Project.projects.length}];
 		Log.log(30, ...this1);
 	}
-	addCommand(cmd, stone) {
+	addCommand(name, stone) {
+		var cmd = new Command(name);
 		if (stone != null) {
 			cmd.alias(stone.id + "." + cmd.name());
 		};
 		Whet_Fields_.program.addCommand(cmd);
+		return cmd;
 	}
 	toString() {
 		return "" + this.name + "@" + this.rootDir;
@@ -73,4 +77,19 @@ class Project extends Register.inherits() {
 }
 
 
-Project.projects = []
+Project.projects = []
+export const Project_Fields_ = Register.global("$hxClasses")["whet._Project.Project_Fields_"] = 
+class Project_Fields_ {
+	static get __name__() {
+		return "whet._Project.Project_Fields_"
+	}
+	get __class__() {
+		return Project_Fields_
+	}
+}
+
+
+Project_Fields_.addOption = function (flags, description) {
+	return new Option(flags, description);
+}
+export const addOption = Project_Fields_.addOption

package/bin/whet/Source.js

@@ -8,6 +8,7 @@ import * as Fs from "fs"
 import {Buffer} from "buffer"
 import {StringTools} from "../StringTools.js"
 import {Lambda} from "../Lambda.js"
+import {HxOverrides} from "../HxOverrides.js"
 
 const $global = Register.$global
 
@@ -45,7 +46,7 @@ class Source extends Register.inherits() {
 			return this.data[0];
 		} else {
 			var s = id;
-			s = Path.posix.normalize(id);
+			s = Path.posix.normalize((id.length > 1 && SourceId_Fields_.startsWithSlash(id)) ? HxOverrides.substr(id, 1, null) : id);
 			s = StringTools.replace(s, "\\", "/");
 			var sid = (SourceId_Fields_.startsWithSlash(s)) ? s : "/" + s;
 			return Lambda.find(this.data, function (entry) {
@@ -124,7 +125,7 @@ class SourceData extends Register.inherits() {
 					var source = SourceData.fromBytes(id, buffer);
 					source.filePath = path;
 					var s = pathId;
-					s = Path.posix.normalize(s);
+					s = Path.posix.normalize((s.length > 1 && SourceId_Fields_.startsWithSlash(s)) ? HxOverrides.substr(s, 1, null) : s);
 					s = StringTools.replace(s, "\\", "/");
 					source.filePathId = (SourceId_Fields_.startsWithSlash(s)) ? s : "/" + s;
 					res(source);
@@ -137,7 +138,7 @@ class SourceData extends Register.inherits() {
 	}
 	static fromBytes(id, data) {
 		var s = id;
-		s = Path.posix.normalize(id);
+		s = Path.posix.normalize((id.length > 1 && SourceId_Fields_.startsWithSlash(id)) ? HxOverrides.substr(id, 1, null) : id);
 		s = StringTools.replace(s, "\\", "/");
 		return new SourceData((SourceId_Fields_.startsWithSlash(s)) ? s : "/" + s, data);
 	}

package/bin/whet/SourceId.js

@@ -13,7 +13,7 @@ class SourceId {
 		};
 		var tmp;
 		var s = this1.substring(0, this1.lastIndexOf("/") + 1);
-		s = Path.posix.normalize(s);
+		s = Path.posix.normalize((s.length > 1 && SourceId_Fields_.startsWithSlash(s)) ? HxOverrides.substr(s, 1, null) : s);
 		s = StringTools.replace(s, "\\", "/");
 		tmp = ((SourceId_Fields_.startsWithSlash(s)) ? s : "/" + s).indexOf(directory) == 0;
 		if (tmp) {
@@ -27,16 +27,16 @@ class SourceId {
 			throw new Error("\"" + dir + "\" is not a directory.");
 		};
 		var s = "/";
-		s = Path.posix.normalize("/");
+		s = Path.posix.normalize(("/".length > 1 && SourceId_Fields_.startsWithSlash("/")) ? HxOverrides.substr("/", 1, null) : "/");
 		s = StringTools.replace(s, "\\", "/");
 		if (dir == ((SourceId_Fields_.startsWithSlash(s)) ? s : "/" + s)) {
 			var s = this1;
-			s = Path.posix.normalize(this1);
+			s = Path.posix.normalize((this1.length > 1 && SourceId_Fields_.startsWithSlash(this1)) ? HxOverrides.substr(this1, 1, null) : this1);
 			s = StringTools.replace(s, "\\", "/");
 			return (SourceId_Fields_.startsWithSlash(s)) ? s : "/" + s;
 		} else {
 			var s = dir + this1;
-			s = Path.posix.normalize(s);
+			s = Path.posix.normalize((s.length > 1 && SourceId_Fields_.startsWithSlash(s)) ? HxOverrides.substr(s, 1, null) : s);
 			s = StringTools.replace(s, "\\", "/");
 			return (SourceId_Fields_.startsWithSlash(s)) ? s : "/" + s;
 		};

package/bin/whet/Stone.d.ts

@@ -4,7 +4,6 @@ import {CacheStrategy} from "./cache/Cache"
 import {SourceHash} from "./SourceHash"
 import {Source, SourceData} from "./Source"
 import {Project} from "./Project"
-import {Command} from "commander"
 
 export declare class Stone<T extends StoneConfig> {
 	constructor(config: T)
@@ -25,9 +24,9 @@ export declare class Stone<T extends StoneConfig> {
 	protected initConfig(): void
 	
 	/**
-	Override this to register commands.
+	Override this to register commands via `this.project.addCommand`.
 	*/
-	protected getCommands(): Command[]
+	protected addCommands(): void
 	
 	/**
 	* **Do not override.**
@@ -77,6 +76,13 @@ export declare class Stone<T extends StoneConfig> {
 	*/
 	setAbsolutePath(path: string, generate?: boolean): Promise<Source>
 	
+	/**
+	* Stores this resource in the supplied path, without changing cache strategy.
+	* @param path Path relative to this stone's project.
+	* Can be a directory or a file path (only if this resource generates single source).
+	*/
+	exportTo(path: string): Promise<any>
+	
 	/**
 	* Convenient function to get CWD-relative path from project-relative one.
 	* Useful for pure JS stones.

package/bin/whet/Stone.js

@@ -1,6 +1,7 @@
 import {StoneId_Fields_} from "./magic/StoneId.js"
 import {CacheStrategy, CacheDurability} from "./cache/Cache.js"
-import {SourceId_Fields_} from "./SourceId.js"
+import {Utils} from "./Utils.js"
+import {SourceId_Fields_, SourceId, RootDir} from "./SourceId.js"
 import {SourceHash} from "./SourceHash.js"
 import {Source} from "./Source.js"
 import {Project} from "./Project.js"
@@ -8,6 +9,7 @@ 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
 
@@ -28,9 +30,7 @@ class Stone extends Register.inherits() {
 		this.initConfig();
 		this.id = (config.id != null) ? StoneId_Fields_.makeStoneId(config.id) : StoneId_Fields_.makeStoneId(this);
 		this.cacheStrategy = (config.cacheStrategy == null) ? this.project.cache.defaultStrategy : config.cacheStrategy;
-		var _g = 0;
-		var _g1 = this.getCommands();
-		while (_g < _g1.length) this.project.addCommand(_g1[_g++], this);
+		this.addCommands();
 	}
 	get cache() {
 		return this.get_cache()
@@ -43,10 +43,9 @@ class Stone extends Register.inherits() {
 	}
 	
 	/**
-	Override this to register commands.
+	Override this to register commands via `this.project.addCommand`.
 	*/
-	getCommands() {
-		return [];
+	addCommands() {
 	}
 	
 	/**
@@ -142,7 +141,7 @@ class Stone extends Register.inherits() {
 			generate = true;
 		};
 		var s = path;
-		s = Path.posix.normalize(path);
+		s = Path.posix.normalize((path.length > 1 && SourceId_Fields_.startsWithSlash(path)) ? HxOverrides.substr(path, 1, null) : path);
 		s = StringTools.replace(s, "\\", "/");
 		this.cacheStrategy = CacheStrategy.AbsolutePath((SourceId_Fields_.startsWithSlash(s)) ? s : "/" + s, CacheDurability.LimitCountByAge(1));
 		if (generate) {
@@ -152,6 +151,40 @@ class Stone extends Register.inherits() {
 		};
 	}
 	
+	/**
+	* Stores this resource in the supplied path, without changing cache strategy.
+	* @param path Path relative to this stone's project.
+	* Can be a directory or a file path (only if this resource generates single source).
+	*/
+	exportTo(path) {
+		var _gthis = this;
+		Log.log(30, ...["Exporting file(s).", {"path": path, "stone": this}]);
+		var s = path;
+		s = Path.posix.normalize((path.length > 1 && SourceId_Fields_.startsWithSlash(path)) ? HxOverrides.substr(path, 1, null) : path);
+		s = StringTools.replace(s, "\\", "/");
+		var pathId = (SourceId_Fields_.startsWithSlash(s)) ? s : "/" + s;
+		var isDir = SourceId_Fields_.endsWithSlash(pathId);
+		return this.getSource().then(function (src) {
+			if (src.data.length > 1 && !isDir) {
+				throw new Error("Path is not a directory for multiple source export.");
+			};
+			var _g = [];
+			var _g1 = 0;
+			var _g2 = src.data;
+			while (_g1 < _g2.length) {
+				var data = _g2[_g1];
+				++_g1;
+				var id = (isDir) ? SourceId.getPutInDir(data.id, pathId) : pathId;
+				var root = RootDir.fromProject(_gthis.project);
+				if (id.charAt(0) != "/") {
+					throw new Error("Badly formed SourceId.");
+				};
+				_g.push(Utils.saveBytes(Path.posix.join(".", root, ".", id), data.data));
+			};
+			return Promise.all(_g);
+		});
+	}
+	
 	/**
 	* Convenient function to get CWD-relative path from project-relative one.
 	* Useful for pure JS stones.

package/bin/whet/Whet.js

@@ -10,7 +10,7 @@ const $global = Register.$global
 export const Whet_Fields_ = Register.global("$hxClasses")["whet._Whet.Whet_Fields_"] = 
 class Whet_Fields_ {
 	static main() {
-		Whet_Fields_.program.enablePositionalOptions().passThroughOptions().description("Project tooling.").usage("[options] [command] [+ [command]...]").version("0.0.6", "-v, --version").allowUnknownOption(true).showSuggestionAfterError(true).option("-p, --project <file>", "project to run", "Project.mjs").option("-l, --log-level <level>", "log level, a string/number", "info");
+		Whet_Fields_.program.enablePositionalOptions().passThroughOptions().description("Project tooling.").usage("[options] [command] [+ [command]...]").version("0.0.7", "-v, --version").allowUnknownOption(true).showSuggestionAfterError(true).option("-p, --project <file>", "project to run", "Project.mjs").option("-l, --log-level <level>", "log level, a string/number", "info");
 		Whet_Fields_.program.parse();
 		var options = Whet_Fields_.program.opts();
 		if (options.logLevel != null) {

package/bin/whet/cache/BaseCache.js

@@ -125,7 +125,7 @@ class BaseCache extends Register.inherits() {
 		var filenames = this.getExistingDirs(stone);
 		var maxNum = (filenames != null) ? Lambda.fold(filenames, function (fn, num) {
 			var s = fn.substring(0, fn.lastIndexOf("/") + 1);
-			s = Path.posix.normalize(s);
+			s = Path.posix.normalize((s.length > 1 && SourceId_Fields_.startsWithSlash(s)) ? HxOverrides.substr(s, 1, null) : s);
 			s = StringTools.replace(s, "\\", "/");
 			var this1 = (SourceId_Fields_.startsWithSlash(s)) ? s : "/" + s;
 			var root = _gthis.rootDir;
@@ -138,7 +138,7 @@ class BaseCache extends Register.inherits() {
 		}, 0) : 0;
 		++maxNum;
 		var s = "v" + maxNum + "/";
-		s = Path.posix.normalize(s);
+		s = Path.posix.normalize((s.length > 1 && SourceId_Fields_.startsWithSlash(s)) ? HxOverrides.substr(s, 1, null) : s);
 		s = StringTools.replace(s, "\\", "/");
 		return SourceId.getPutInDir((SourceId_Fields_.startsWithSlash(s)) ? s : "/" + s, baseDir);
 	}

package/bin/whet/cache/CacheManager.js

@@ -6,6 +6,7 @@ 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
 
@@ -53,7 +54,7 @@ class CacheManager extends Register.inherits() {
 	*/
 	getDir(stone, hash) {
 		var s = stone.id + "/";
-		s = Path.posix.normalize(s);
+		s = Path.posix.normalize((s.length > 1 && SourceId_Fields_.startsWithSlash(s)) ? HxOverrides.substr(s, 1, null) : s);
 		s = StringTools.replace(s, "\\", "/");
 		var baseDir = (SourceId_Fields_.startsWithSlash(s)) ? s : "/" + s;
 		var tmp;
@@ -70,12 +71,12 @@ class CacheManager extends Register.inherits() {
 		};
 		if (tmp) {
 			var s = ".temp/";
-			s = Path.posix.normalize(".temp/");
+			s = Path.posix.normalize((".temp/".length > 1 && SourceId_Fields_.startsWithSlash(".temp/")) ? HxOverrides.substr(".temp/", 1, null) : ".temp/");
 			s = StringTools.replace(s, "\\", "/");
 			baseDir = SourceId.getPutInDir(baseDir, (SourceId_Fields_.startsWithSlash(s)) ? s : "/" + s);
 		};
 		var s = ".whet/";
-		s = Path.posix.normalize(".whet/");
+		s = Path.posix.normalize((".whet/".length > 1 && SourceId_Fields_.startsWithSlash(".whet/")) ? HxOverrides.substr(".whet/", 1, null) : ".whet/");
 		s = StringTools.replace(s, "\\", "/");
 		baseDir = SourceId.getPutInDir(baseDir, (SourceId_Fields_.startsWithSlash(s)) ? s : "/" + s);
 		var id;
@@ -93,7 +94,7 @@ class CacheManager extends Register.inherits() {
 			case 3:
 				var _g1 = _g.path;
 				var s = _g1.substring(0, _g1.lastIndexOf("/") + 1);
-				s = Path.posix.normalize(s);
+				s = Path.posix.normalize((s.length > 1 && SourceId_Fields_.startsWithSlash(s)) ? HxOverrides.substr(s, 1, null) : s);
 				s = StringTools.replace(s, "\\", "/");
 				id = (SourceId_Fields_.startsWithSlash(s)) ? s : "/" + s;
 				break

package/bin/whet/cache/FileCache.js

@@ -21,7 +21,7 @@ class FileCache extends Register.inherits(BaseCache) {
 		this.flushQueued = false;
 		super.new(rootDir, new StringMap());
 		var s = ".whet/cache.json";
-		s = Path.posix.normalize(".whet/cache.json");
+		s = Path.posix.normalize((".whet/cache.json".length > 1 && SourceId_Fields_.startsWithSlash(".whet/cache.json")) ? HxOverrides.substr(".whet/cache.json", 1, null) : ".whet/cache.json");
 		s = StringTools.replace(s, "\\", "/");
 		var this1 = (SourceId_Fields_.startsWithSlash(s)) ? s : "/" + s;
 		if (this1.charAt(0) != "/") {
@@ -44,7 +44,7 @@ class FileCache extends Register.inherits(BaseCache) {
 					var tmp = SourceHash.fromHex(val.hash);
 					var val1 = val.ctime;
 					var s = val.baseDir;
-					s = Path.posix.normalize(s);
+					s = Path.posix.normalize((s.length > 1 && SourceId_Fields_.startsWithSlash(s)) ? HxOverrides.substr(s, 1, null) : s);
 					s = StringTools.replace(s, "\\", "/");
 					var tmp1 = (SourceId_Fields_.startsWithSlash(s)) ? s : "/" + s;
 					var _g2 = [];
@@ -55,11 +55,11 @@ class FileCache extends Register.inherits(BaseCache) {
 						++_g3;
 						var tmp2 = SourceHash.fromHex(file.fileHash);
 						var s1 = file.filePath;
-						s1 = Path.posix.normalize(s1);
+						s1 = Path.posix.normalize((s1.length > 1 && SourceId_Fields_.startsWithSlash(s1)) ? HxOverrides.substr(s1, 1, null) : s1);
 						s1 = StringTools.replace(s1, "\\", "/");
 						var tmp3 = (SourceId_Fields_.startsWithSlash(s1)) ? s1 : "/" + s1;
 						var s2 = file.id;
-						s2 = Path.posix.normalize(s2);
+						s2 = Path.posix.normalize((s2.length > 1 && SourceId_Fields_.startsWithSlash(s2)) ? HxOverrides.substr(s2, 1, null) : s2);
 						s2 = StringTools.replace(s2, "\\", "/");
 						_g2.push({"fileHash": tmp2, "filePath": tmp3, "id": (SourceId_Fields_.startsWithSlash(s2)) ? s2 : "/" + s2});
 					};
@@ -80,7 +80,7 @@ class FileCache extends Register.inherits(BaseCache) {
 			var _g1 = _g.path;
 			if (source.data.length == 1) {
 				var s = _g1.substring(_g1.lastIndexOf("/"));
-				s = Path.posix.normalize(s);
+				s = Path.posix.normalize((s.length > 1 && SourceId_Fields_.startsWithSlash(s)) ? HxOverrides.substr(s, 1, null) : s);
 				s = StringTools.replace(s, "\\", "/");
 				idOverride = (SourceId_Fields_.startsWithSlash(s)) ? s : "/" + s;
 			} else {
@@ -116,7 +116,7 @@ class FileCache extends Register.inherits(BaseCache) {
 			} else {
 				var value1 = value.baseDir;
 				var s = _g1.substring(0, _g1.lastIndexOf("/") + 1);
-				s = Path.posix.normalize(s);
+				s = Path.posix.normalize((s.length > 1 && SourceId_Fields_.startsWithSlash(s)) ? HxOverrides.substr(s, 1, null) : s);
 				s = StringTools.replace(s, "\\", "/");
 				invalidPath = value1 != ((SourceId_Fields_.startsWithSlash(s)) ? s : "/" + s);
 			};
@@ -292,7 +292,7 @@ class FileCache extends Register.inherits(BaseCache) {
 					var tmp1 = HxOverrides.dateStr(new Date(val.ctime * 1000));
 					var this2 = val.baseDir;
 					var s = "/";
-					s = Path.posix.normalize("/");
+					s = Path.posix.normalize(("/".length > 1 && SourceId_Fields_.startsWithSlash("/")) ? HxOverrides.substr("/", 1, null) : "/");
 					s = StringTools.replace(s, "\\", "/");
 					var root = (SourceId_Fields_.startsWithSlash(s)) ? s : "/" + s;
 					if (this2.charAt(0) != "/") {
@@ -308,7 +308,7 @@ class FileCache extends Register.inherits(BaseCache) {
 						var tmp3 = SourceHash.toHex(file.fileHash);
 						var this3 = file.filePath;
 						var s1 = "/";
-						s1 = Path.posix.normalize("/");
+						s1 = Path.posix.normalize(("/".length > 1 && SourceId_Fields_.startsWithSlash("/")) ? HxOverrides.substr("/", 1, null) : "/");
 						s1 = StringTools.replace(s1, "\\", "/");
 						var root1 = (SourceId_Fields_.startsWithSlash(s1)) ? s1 : "/" + s1;
 						if (this3.charAt(0) != "/") {
@@ -317,7 +317,7 @@ class FileCache extends Register.inherits(BaseCache) {
 						var tmp4 = Path.posix.join(".", root1, ".", this3);
 						var this4 = file.id;
 						var s2 = "/";
-						s2 = Path.posix.normalize("/");
+						s2 = Path.posix.normalize(("/".length > 1 && SourceId_Fields_.startsWithSlash("/")) ? HxOverrides.substr("/", 1, null) : "/");
 						s2 = StringTools.replace(s2, "\\", "/");
 						var root2 = (SourceId_Fields_.startsWithSlash(s2)) ? s2 : "/" + s2;
 						if (this4.charAt(0) != "/") {

package/bin/whet/magic/RoutePathType.js

@@ -5,6 +5,7 @@ import {SourceId_Fields_} from "../SourceId.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
 
@@ -33,7 +34,7 @@ class RoutePathType_Fields_ {
 				throw new Error("RoutePath element should have at most 3 entries `[serveId, route, filter]`.");
 			};
 			var s = item[0];
-			s = Path.posix.normalize(s);
+			s = Path.posix.normalize((s.length > 1 && SourceId_Fields_.startsWithSlash(s)) ? HxOverrides.substr(s, 1, null) : s);
 			s = StringTools.replace(s, "\\", "/");
 			var tmp = (SourceId_Fields_.startsWithSlash(s)) ? s : "/" + s;
 			var _g3 = item.slice(1);

package/bin/whet/magic/RouteType.d.ts

@@ -1,3 +1,4 @@
+import {RouteResult} from "../route/RouteResult"
 import {Route, RouteData} from "../route/Route"
 import {MaybeArray} from "./MaybeArray"
 import {AnyStone} from "../Stone"
@@ -7,6 +8,6 @@ import {AnyStone} from "../Stone"
 */
 export type RouteType = Route | MaybeArray<MaybeArray<BaseRouteType>>
 
-export type BaseRouteType = string | AnyStone
+export type BaseRouteType = RouteResult | string | AnyStone
 
 export const makeRoute: (routeType: RouteType) => Route

package/bin/whet/magic/RouteType.js

@@ -1,4 +1,5 @@
 import {Files} from "../stones/Files.js"
+import {RouteResult} from "../route/RouteResult.js"
 import {Route} from "../route/Route.js"
 import {MaybeArray_Fields_} from "./MaybeArray.js"
 import {Stone} from "../Stone.js"
@@ -7,6 +8,7 @@ import * as Path from "path"
 import {Register} from "../../genes/Register.js"
 import {StringTools} from "../../StringTools.js"
 import {Std} from "../../Std.js"
+import {HxOverrides} from "../../HxOverrides.js"
 
 const $global = Register.$global
 
@@ -33,7 +35,7 @@ class RouteType_Fields_ {
 				};
 				var tinner1 = tinner[0];
 				var s = tinner[1];
-				s = Path.posix.normalize(s);
+				s = Path.posix.normalize((s.length > 1 && SourceId_Fields_.startsWithSlash(s)) ? HxOverrides.substr(s, 1, null) : s);
 				s = StringTools.replace(s, "\\", "/");
 				_g.push(RouteType_Fields_.getRoute(tinner1, (SourceId_Fields_.startsWithSlash(s)) ? s : "/" + s));
 			};
@@ -48,11 +50,11 @@ class RouteType_Fields_ {
 				tmp1 = path;
 			} else {
 				var s = t;
-				s = Path.posix.normalize(s);
+				s = Path.posix.normalize((s.length > 1 && SourceId_Fields_.startsWithSlash(s)) ? HxOverrides.substr(s, 1, null) : s);
 				s = StringTools.replace(s, "\\", "/");
 				var p = (SourceId_Fields_.startsWithSlash(s)) ? s : "/" + s;
 				var s = p.substring(0, p.lastIndexOf("/") + 1);
-				s = Path.posix.normalize(s);
+				s = Path.posix.normalize((s.length > 1 && SourceId_Fields_.startsWithSlash(s)) ? HxOverrides.substr(s, 1, null) : s);
 				s = StringTools.replace(s, "\\", "/");
 				tmp1 = SourceId.relativeTo(p, (SourceId_Fields_.startsWithSlash(s)) ? s : "/" + s);
 			};
@@ -63,13 +65,15 @@ class RouteType_Fields_ {
 				tmp = path;
 			} else {
 				var s = "/";
-				s = Path.posix.normalize("/");
+				s = Path.posix.normalize(("/".length > 1 && SourceId_Fields_.startsWithSlash("/")) ? HxOverrides.substr("/", 1, null) : "/");
 				s = StringTools.replace(s, "\\", "/");
 				tmp = (SourceId_Fields_.startsWithSlash(s)) ? s : "/" + s;
 			};
 			return {"stone": t, "path": tmp};
+		} else if (((t) instanceof RouteResult)) {
+			return {"stone": t.source, "path": t.sourceId};
 		} else {
-			throw new Error("Unsupported type for Route. Expected String or Stone, but got " + Std.string(t.constructor?.name) + ".");
+			throw new Error("Unsupported type for Route. Expected String, Stone or RouteResult, but got " + Std.string(t.constructor?.name) + ".");
 		};
 	}
 	static get __name__() {

package/bin/whet/route/Route.js

@@ -5,6 +5,7 @@ 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
 
@@ -58,7 +59,7 @@ class Route extends Register.inherits() {
 							if (path == r[0].path) {
 								var _g1 = r[0].stone;
 								var s = path.substring(path.lastIndexOf("/"));
-								s = Path.posix.normalize(s);
+								s = Path.posix.normalize((s.length > 1 && SourceId_Fields_.startsWithSlash(s)) ? HxOverrides.substr(s, 1, null) : s);
 								s = StringTools.replace(s, "\\", "/");
 								arr.push(new RouteResult((SourceId_Fields_.startsWithSlash(s)) ? s : "/" + s, path, _g1));
 							};

package/bin/whet/route/Router.js

@@ -5,6 +5,7 @@ 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
 
@@ -26,7 +27,7 @@ class Router extends Register.inherits() {
 	find(id, firstOnly) {
 		var _gthis = this;
 		var s = id;
-		s = Path.posix.normalize(id);
+		s = Path.posix.normalize((id.length > 1 && SourceId_Fields_.startsWithSlash(id)) ? HxOverrides.substr(id, 1, null) : id);
 		s = StringTools.replace(s, "\\", "/");
 		var sourceId = (SourceId_Fields_.startsWithSlash(s)) ? s : "/" + s;
 		return new Promise(function (res, rej) {
@@ -56,7 +57,7 @@ class Router extends Register.inherits() {
 									};
 								} else if (sourceId == item.serveId) {
 									var s = sourceId.substring(sourceId.lastIndexOf("/"));
-									s = Path.posix.normalize(s);
+									s = Path.posix.normalize((s.length > 1 && SourceId_Fields_.startsWithSlash(s)) ? HxOverrides.substr(s, 1, null) : s);
 									s = StringTools.replace(s, "\\", "/");
 									item.serveId = (SourceId_Fields_.startsWithSlash(s)) ? s : "/" + s;
 									result.push(item);
@@ -76,7 +77,7 @@ class Router extends Register.inherits() {
 									};
 								} else if (sourceId == item.serveId) {
 									var s = sourceId.substring(sourceId.lastIndexOf("/"));
-									s = Path.posix.normalize(s);
+									s = Path.posix.normalize((s.length > 1 && SourceId_Fields_.startsWithSlash(s)) ? HxOverrides.substr(s, 1, null) : s);
 									s = StringTools.replace(s, "\\", "/");
 									item.serveId = (SourceId_Fields_.startsWithSlash(s)) ? s : "/" + s;
 									result.push(item);
@@ -164,7 +165,7 @@ class Router extends Register.inherits() {
 				var saveInto1 = saveInto;
 				var this1 = r.serveId;
 				var s = "/";
-				s = Path.posix.normalize("/");
+				s = Path.posix.normalize(("/".length > 1 && SourceId_Fields_.startsWithSlash("/")) ? HxOverrides.substr("/", 1, null) : "/");
 				s = StringTools.replace(s, "\\", "/");
 				var root = (SourceId_Fields_.startsWithSlash(s)) ? s : "/" + s;
 				if (this1.charAt(0) != "/") {

package/bin/whet/stones/Files.js

@@ -6,6 +6,7 @@ import * as Path from "path"
 import {Register} from "../../genes/Register.js"
 import * as Fs from "fs"
 import {StringTools} from "../../StringTools.js"
+import {HxOverrides} from "../../HxOverrides.js"
 
 const $global = Register.$global
 
@@ -20,7 +21,7 @@ class Files extends Register.inherits(Stone) {
 		while (0 < _g.length) {
 			var pathString = _g[0];
 			var s = pathString;
-			s = Path.posix.normalize(pathString);
+			s = Path.posix.normalize((pathString.length > 1 && SourceId_Fields_.startsWithSlash(pathString)) ? HxOverrides.substr(pathString, 1, null) : pathString);
 			s = StringTools.replace(s, "\\", "/");
 			var path = [(SourceId_Fields_.startsWithSlash(s)) ? s : "/" + s];
 			var tmp;
@@ -43,7 +44,7 @@ class Files extends Register.inherits(Stone) {
 										var file = files[_g1];
 										++_g1;
 										var s = file;
-										s = Path.posix.normalize(file);
+										s = Path.posix.normalize((file.length > 1 && SourceId_Fields_.startsWithSlash(file)) ? HxOverrides.substr(file, 1, null) : file);
 										s = StringTools.replace(s, "\\", "/");
 										var filepath = SourceId.getPutInDir((SourceId_Fields_.startsWithSlash(s)) ? s : "/" + s, path[0]);
 										_g.push({"id": SourceId.relativeTo(filepath, path[0]), "pathId": filepath});
@@ -56,7 +57,7 @@ class Files extends Register.inherits(Stone) {
 				})(path));
 			} else {
 				var s1 = path[0].substring(path[0].lastIndexOf("/"));
-				s1 = Path.posix.normalize(s1);
+				s1 = Path.posix.normalize((s1.length > 1 && SourceId_Fields_.startsWithSlash(s1)) ? HxOverrides.substr(s1, 1, null) : s1);
 				s1 = StringTools.replace(s1, "\\", "/");
 				tmp = Promise.resolve([{"id": (SourceId_Fields_.startsWithSlash(s1)) ? s1 : "/" + s1, "pathId": path[0]}]);
 			};

package/bin/whet/stones/JsonStone.js

@@ -8,6 +8,7 @@ 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,7 +92,7 @@ class JsonStone extends Register.inherits(Stone) {
 	}
 	list() {
 		var s = this.config.name;
-		s = Path.posix.normalize(s);
+		s = Path.posix.normalize((s.length > 1 && SourceId_Fields_.startsWithSlash(s)) ? HxOverrides.substr(s, 1, null) : s);
 		s = StringTools.replace(s, "\\", "/");
 		return Promise.resolve([(SourceId_Fields_.startsWithSlash(s)) ? s : "/" + s]);
 	}

package/bin/whet/stones/RemoteFile.js

@@ -10,6 +10,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,7 +52,7 @@ class RemoteFile extends Register.inherits(Stone) {
 	}
 	getId() {
 		var s = Path.basename(new URL(this.config.url).pathname);
-		s = Path.posix.normalize(s);
+		s = Path.posix.normalize((s.length > 1 && SourceId_Fields_.startsWithSlash(s)) ? HxOverrides.substr(s, 1, null) : s);
 		s = StringTools.replace(s, "\\", "/");
 		return (SourceId_Fields_.startsWithSlash(s)) ? s : "/" + s;
 	}

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

@@ -5,9 +5,9 @@ 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
 
@@ -41,35 +41,36 @@ class Server extends Register.inherits(Stone) {
 		if (this.config.port == null) {
 			this.config.port = 7000;
 		};
+		this.project.addCommand("serve", this);
 	}
-	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 = Path.posix.normalize((s.length > 1 && SourceId_Fields_.startsWithSlash(s)) ? HxOverrides.substr(s, 1, null) : s);
 		s = StringTools.replace(s, "\\", "/");
 		var id = (SourceId_Fields_.startsWithSlash(s)) ? s : "/" + s;
 		if (req.method == "GET") {
 			if (SourceId_Fields_.endsWithSlash(id)) {
 				if ("index.html".length > 0) {
 					var s = id.substring(0, id.lastIndexOf("/") + 1);
-					s = Path.posix.normalize(s);
+					s = Path.posix.normalize((s.length > 1 && SourceId_Fields_.startsWithSlash(s)) ? HxOverrides.substr(s, 1, null) : s);
 					s = StringTools.replace(s, "\\", "/");
 					id = ((SourceId_Fields_.startsWithSlash(s)) ? s : "/" + s) + "index.html";
 				};
 			} else if (Path.posix.extname(id) == "") {
 				var s = "" + id + "/index.html";
-				s = Path.posix.normalize(s);
+				s = Path.posix.normalize((s.length > 1 && SourceId_Fields_.startsWithSlash(s)) ? HxOverrides.substr(s, 1, null) : s);
 				s = StringTools.replace(s, "\\", "/");
 				id = (SourceId_Fields_.startsWithSlash(s)) ? s : "/" + s;
 			};

package/bin/whet/stones/Zip.js

@@ -15,6 +15,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,7 +76,7 @@ class ZipStone extends Register.inherits(Stone) {
 						var bytes = Helper.bytesOfBuffer(data.data);
 						var this1 = file[0].serveId;
 						var s = "/";
-						s = Path.posix.normalize("/");
+						s = Path.posix.normalize(("/".length > 1 && SourceId_Fields_.startsWithSlash("/")) ? HxOverrides.substr("/", 1, null) : "/");
 						s = StringTools.replace(s, "\\", "/");
 						var root = (SourceId_Fields_.startsWithSlash(s)) ? s : "/" + s;
 						if (this1.charAt(0) != "/") {
@@ -99,7 +100,7 @@ class ZipStone extends Register.inherits(Stone) {
 	}
 	list() {
 		var s = this.config.filename;
-		s = Path.posix.normalize(s);
+		s = Path.posix.normalize((s.length > 1 && SourceId_Fields_.startsWithSlash(s)) ? HxOverrides.substr(s, 1, null) : s);
 		s = StringTools.replace(s, "\\", "/");
 		return Promise.resolve([(SourceId_Fields_.startsWithSlash(s)) ? s : "/" + s]);
 	}

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

@@ -7,9 +7,9 @@ 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,7 +34,7 @@ class HaxeBuild extends Register.inherits(Stone) {
 			var cwd = process.cwd();
 			var this1 = _gthis.project.rootDir;
 			var s = "/";
-			s = Path.posix.normalize("/");
+			s = Path.posix.normalize(("/".length > 1 && SourceId_Fields_.startsWithSlash("/")) ? HxOverrides.substr("/", 1, null) : "/");
 			s = StringTools.replace(s, "\\", "/");
 			var root = (SourceId_Fields_.startsWithSlash(s)) ? s : "/" + s;
 			if (this1.charAt(0) != "/") {
@@ -84,11 +84,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,7 +105,7 @@ class HaxeBuild extends Register.inherits(Stone) {
 		while (_g < _g1) {
 			var i = _g++;
 			var s = _this[i];
-			s = Path.posix.normalize(s);
+			s = Path.posix.normalize((s.length > 1 && SourceId_Fields_.startsWithSlash(s)) ? HxOverrides.substr(s, 1, null) : s);
 			s = StringTools.replace(s, "\\", "/");
 			var this1 = (SourceId_Fields_.startsWithSlash(s)) ? s : "/" + s;
 			var root = RootDir.fromProject(this.config.hxml.project);

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

@@ -149,12 +149,12 @@ 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 = Path.posix.normalize((s.length > 1 && SourceId_Fields_.startsWithSlash(s)) ? HxOverrides.substr(s, 1, null) : s);
 				s = StringTools.replace(s, "\\", "/");
 				filename = (SourceId_Fields_.startsWithSlash(s)) ? s : "/" + s;
 			} else {
 				var s = "build";
-				s = Path.posix.normalize("build");
+				s = Path.posix.normalize(("build".length > 1 && SourceId_Fields_.startsWithSlash("build")) ? HxOverrides.substr("build", 1, null) : "build");
 				s = StringTools.replace(s, "\\", "/");
 				filename = (SourceId_Fields_.startsWithSlash(s)) ? s : "/" + s;
 			};
@@ -164,7 +164,7 @@ class Hxml extends Register.inherits(Stone) {
 					v = "." + v;
 				};
 				var s = filename.substring(0, filename.lastIndexOf("/") + 1);
-				s = Path.posix.normalize(s);
+				s = Path.posix.normalize((s.length > 1 && SourceId_Fields_.startsWithSlash(s)) ? HxOverrides.substr(s, 1, null) : s);
 				s = StringTools.replace(s, "\\", "/");
 				filename = ((SourceId_Fields_.startsWithSlash(s)) ? s : "/" + s) + Path.posix.parse(filename.substring(filename.lastIndexOf("/"))).name + v;
 			};
@@ -176,7 +176,7 @@ class Hxml extends Register.inherits(Stone) {
 	getPlatform() {
 		var this1 = this.getBuildExportPath();
 		var s = "/";
-		s = Path.posix.normalize("/");
+		s = Path.posix.normalize(("/".length > 1 && SourceId_Fields_.startsWithSlash("/")) ? HxOverrides.substr("/", 1, null) : "/");
 		s = StringTools.replace(s, "\\", "/");
 		var root = (SourceId_Fields_.startsWithSlash(s)) ? s : "/" + s;
 		if (this1.charAt(0) != "/") {
@@ -282,7 +282,7 @@ class Hxml extends Register.inherits(Stone) {
 	}
 	filename() {
 		var s = this.id;
-		s = Path.posix.normalize(s);
+		s = Path.posix.normalize((s.length > 1 && SourceId_Fields_.startsWithSlash(s)) ? HxOverrides.substr(s, 1, null) : s);
 		s = StringTools.replace(s, "\\", "/");
 		var fn = (SourceId_Fields_.startsWithSlash(s)) ? s : "/" + s;
 		if (Path.posix.extname(fn) == "") {
@@ -291,7 +291,7 @@ class Hxml extends Register.inherits(Stone) {
 				v = "." + "hxml";
 			};
 			var s = fn.substring(0, fn.lastIndexOf("/") + 1);
-			s = Path.posix.normalize(s);
+			s = Path.posix.normalize((s.length > 1 && SourceId_Fields_.startsWithSlash(s)) ? HxOverrides.substr(s, 1, null) : s);
 			s = StringTools.replace(s, "\\", "/");
 			fn = ((SourceId_Fields_.startsWithSlash(s)) ? s : "/" + s) + Path.posix.parse(fn.substring(fn.lastIndexOf("/"))).name + v;
 		};

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.7",
     "description": "NodeJS based assets management and project tooling library.",
     "scripts": {
         "devinit": "npx dts2hx commander --modular --noLibWrap",