whet 0.0.23 → 0.0.24

package/bin/whet/Source.js

@@ -119,7 +119,7 @@ class SourceData extends Register.inherits() {
 		return new Promise(function (res, rej) {
 			Fs.readFile(path, function (err, buffer) {
 				if (err != null) {
-					Log.log(50, ...["File does not exist.", {"id": id, "path": path}]);
+					Log.log(50, ...["File does not exist.", {"id": id, "path": path, "error": err}]);
 					rej(err);
 				} else {
 					var source = SourceData.fromBytes(id, buffer);

package/bin/whet/SourceId.d.ts

@@ -17,6 +17,7 @@ export declare class IdUtils {
 	static getDir(id: string): string
 	static setDir(id: string, dir: string): string
 	static fromCwdPath(s: string, root: string): string
+	static normalize(str: string): string
 }
 
 export declare class RootDir {

package/bin/whet/SourceId.js

@@ -110,6 +110,13 @@ class IdUtils {
 		var rootStr = Path.posix.resolve(root);
 		return Path.posix.relative(rootStr, absPath1);
 	}
+	static normalize(str) {
+		if (str.length > 0) {
+			str = Path.posix.normalize(str);
+			str = StringTools.replace(str, "\\", "/");
+		};
+		return str;
+	}
 	static get __name__() {
 		return "whet.IdUtils"
 	}

package/bin/whet/Whet.js

@@ -12,7 +12,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.23", "-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").option("--no-pretty", "disable pretty logging").exitOverride();
+		Whet_Fields_.program.enablePositionalOptions().passThroughOptions().description("Project tooling.").usage("[options] [command] [+ [command]...]").version("0.0.24", "-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").option("--no-pretty", "disable pretty logging").exitOverride();
 		try {
 			Whet_Fields_.program.parse();
 		}catch (_g) {

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

@@ -10,6 +10,7 @@ export declare class RemoteFile extends Stone<RemoteFileConfig> {
 	constructor(config: RemoteFileConfig)
 	protected initConfig(): void
 	protected generate(hash: SourceHash): Promise<SourceData[]>
+	protected get(url: string, res: ((arg0: SourceData[]) => void), rej: ((reason: any) => void)): void
 	list(): Promise<string[]>
 	generateHash(): Promise<SourceHash>
 	protected getId(): string

package/bin/whet/stones/RemoteFile.js

@@ -25,19 +25,27 @@ class RemoteFile extends Register.inherits(Stone) {
 		var _gthis = this;
 		Log.log(30, ...["Downloading file.", {"url": this.config.url}]);
 		return new Promise(function (res, rej) {
-			Https.get(_gthis.config.url, function (response) {
-				if (response.statusCode < 200 || response.statusCode >= 300) {
-					response.resume();
-					throw new Error("Error downloading file. " + response.statusCode + " – " + response.statusMessage);
-				};
-				var bufs = [];
-				response.on("data", function (d) {
-					return bufs.push(d);
-				});
-				response.on("end", function () {
-					var data = Buffer.concat(bufs);
-					res([SourceData.fromBytes(_gthis.getId(), data)]);
-				});
+			_gthis.get(_gthis.config.url, res, rej);
+		});
+	}
+	get(url, res, rej) {
+		var _gthis = this;
+		Https.get(url, function (response) {
+			if (response.statusCode == 301 || response.statusCode == 302) {
+				_gthis.get(response.headers["location"], res, rej);
+				return;
+			};
+			if (response.statusCode < 200 || response.statusCode >= 300) {
+				response.resume();
+				throw new Error("Error downloading file. " + response.statusCode + " – " + response.statusMessage);
+			};
+			var bufs = [];
+			response.on("data", function (d) {
+				return bufs.push(d);
+			});
+			response.on("end", function () {
+				var data = Buffer.concat(bufs);
+				res([SourceData.fromBytes(_gthis.getId(), data)]);
 			});
 		});
 	}

package/package.json

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