whet 0.0.3 → 0.0.6

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

@@ -3,12 +3,13 @@ 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 {SourceId, SourceId_Fields_} from "../../SourceId.js"
 import {SourceHash} from "../../SourceHash.js"
 import {SourceData} from "../../Source.js"
 import {Log} from "../../Log.js"
-import {Path} from "../../../haxe/io/Path.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 Hxml extends Register.inherits(Stone) {
 	}
 	clone(id) {
 		var configClone = this.cloneConfig(this.config);
-		configClone.id = StoneId_Fields_.makeStoneId(id);
+		configClone.id = StoneId_Fields_.makeStoneId((id == null) ? this.id : id);
 		return new Hxml(configClone);
 	}
 	mergeConfig(additionalConfig) {
@@ -88,18 +89,23 @@ class Hxml extends Register.inherits(Stone) {
 		};
 		var args1 = args.concat(result);
 		if (this.config.dce != null) {
+			var _g = this.config.dce;
 			var tmp;
-			switch (this.config.dce._hx_index) {
-				case 0:
-					tmp = "std";
-					break
-				case 1:
-					tmp = "full";
-					break
-				case 2:
-					tmp = "no";
-					break
-				
+			if (_g == null) {
+				throw new Error("Invalid DCE value.");
+			} else {
+				switch (_g._hx_index) {
+					case 0:
+						tmp = "std";
+						break
+					case 1:
+						tmp = "full";
+						break
+					case 2:
+						tmp = "no";
+						break
+					
+				};
 			};
 			args1.push(["-dce", tmp]);
 		};
@@ -142,18 +148,25 @@ class Hxml extends Register.inherits(Stone) {
 		if (this.isSingleFile()) {
 			var filename;
 			if (this.build.config.filename != null) {
-				filename = this.build.config.filename;
+				var s = this.build.config.filename;
+				s = Path.posix.normalize(s);
+				s = StringTools.replace(s, "\\", "/");
+				filename = (SourceId_Fields_.startsWithSlash(s)) ? s : "/" + s;
 			} else {
-				var norm = "/" + Path.normalize(("build".charAt(0) == "/") ? HxOverrides.substr("build", 1, null) : "build");
-				filename = ("build".lastIndexOf("/") == "build".length - 1) ? Path.addTrailingSlash(norm) : norm;
+				var s = "build";
+				s = Path.posix.normalize("build");
+				s = StringTools.replace(s, "\\", "/");
+				filename = (SourceId_Fields_.startsWithSlash(s)) ? s : "/" + s;
 			};
-			if (Path.extension(filename) == "") {
+			if (Path.posix.extname(filename) == "") {
 				var v = this.getBuildExtension();
-				var p = new Path(filename);
-				p.ext = v;
-				var s = p.toString();
-				var norm = "/" + Path.normalize((s.charAt(0) == "/") ? HxOverrides.substr(s, 1, null) : s);
-				filename = (s.lastIndexOf("/") == s.length - 1) ? Path.addTrailingSlash(norm) : norm;
+				if (v.length > 0 && HxOverrides.cca(v, 0) != 46) {
+					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;
 			};
 			return filename;
 		} else {
@@ -162,9 +175,14 @@ class Hxml extends Register.inherits(Stone) {
 	}
 	getPlatform() {
 		var this1 = this.getBuildExportPath();
-		var norm = "/" + Path.normalize(("/".charAt(0) == "/") ? HxOverrides.substr("/", 1, null) : "/");
-		var root = ("/".lastIndexOf("/") == "/".length - 1) ? Path.addTrailingSlash(norm) : norm;
-		var path = (root.length == 1) ? this1.substring(1) : root.substring(1, root.length - 1) + this1;
+		var s = "/";
+		s = Path.posix.normalize("/");
+		s = StringTools.replace(s, "\\", "/");
+		var root = (SourceId_Fields_.startsWithSlash(s)) ? s : "/" + s;
+		if (this1.charAt(0) != "/") {
+			throw new Error("Badly formed SourceId.");
+		};
+		var path = Path.posix.join(".", root, ".", this1);
 		var _g = this.config.platform;
 		if (_g == null) {
 			return [];
@@ -264,14 +282,18 @@ class Hxml extends Register.inherits(Stone) {
 	}
 	filename() {
 		var s = this.id;
-		var norm = "/" + Path.normalize((s.charAt(0) == "/") ? HxOverrides.substr(s, 1, null) : s);
-		var fn = (s.lastIndexOf("/") == s.length - 1) ? Path.addTrailingSlash(norm) : norm;
-		if (Path.extension(fn) == "") {
-			var p = new Path(fn);
-			p.ext = "hxml";
-			var s = p.toString();
-			var norm = "/" + Path.normalize((s.charAt(0) == "/") ? HxOverrides.substr(s, 1, null) : s);
-			fn = (s.lastIndexOf("/") == s.length - 1) ? Path.addTrailingSlash(norm) : norm;
+		s = Path.posix.normalize(s);
+		s = StringTools.replace(s, "\\", "/");
+		var fn = (SourceId_Fields_.startsWithSlash(s)) ? 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;
 		};
 		return fn;
 	}

package/bin/whet.d.ts

@@ -1,10 +1,12 @@
 
 export {ZipStone} from "./whet/stones/Zip"
 export {ZipConfig} from "./whet/stones/Zip"
+export {Utils} from "./whet/Utils"
 export {Stone} from "./whet/Stone"
 export {ServerConfig} from "./whet/stones/Server"
 export {Server} from "./whet/stones/Server"
 export {Router} from "./whet/route/Router"
+export {Route} from "./whet/route/Route"
 export {RemoteFileConfig} from "./whet/stones/RemoteFile"
 export {RemoteFile} from "./whet/stones/RemoteFile"
 export {Project} from "./whet/Project"

package/bin/whet.js

@@ -6,9 +6,11 @@ const $global = Register.$global
 
 Whet_Fields_.main()
 export {ZipStone} from "./whet/stones/Zip.js"
+export {Utils} from "./whet/Utils.js"
 export {Stone} from "./whet/Stone.js"
 export {Server} from "./whet/stones/Server.js"
 export {Router} from "./whet/route/Router.js"
+export {Route} from "./whet/route/Route.js"
 export {RemoteFile} from "./whet/stones/RemoteFile.js"
 export {Project} from "./whet/Project.js"
 export {Log} from "./whet/Log.js"

package/package.json

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