whet 0.0.14 → 0.0.15

package/bin/whet/Source.d.ts

@@ -39,12 +39,14 @@ export declare class SourceData {
 	/**
 	Same as `getFilePath` but relative to project, not CWD.
 	*/
-	protected getFilePathId(idOverride?: null | string): Promise<string>
+	getFilePathId(idOverride?: null | string): Promise<string>
 	
 	/**
-	Path to a file for this source, relative to CWD.
+	* Path to a file for this source, relative to CWD.
+	* Useful for working with sources outside of Whet ecosystem.
+	* @param [idOverride] Use to change the name/directory of the file. Ignored if source already has a filepath.
 	*/
-	protected getFilePath(idOverride?: null | string): Promise<string>
+	getFilePath(idOverride?: null | string): Promise<string>
 	
 	/**
 	* @param id Path id relative to stone that generates it.

package/bin/whet/Source.js

@@ -1,9 +1,8 @@
 import {Utils} from "./Utils.js"
 import {SourceId, RootDir} from "./SourceId.js"
 import {SourceHash} from "./SourceHash.js"
-import {Log as Log__1} from "./Log.js"
+import {Log} from "./Log.js"
 import * as Path from "path"
-import {Log} from "../haxe/Log.js"
 import {Register} from "../genes/Register.js"
 import * as Fs from "fs"
 import {Buffer} from "buffer"
@@ -83,7 +82,6 @@ class SourceData extends Register.inherits() {
 	*/
 	getFilePathId(idOverride) {
 		var _gthis = this;
-		Log.trace(this.filePath, {"fileName": "src/whet/Source.hx", "lineNumber": 106, "className": "whet.SourceData", "methodName": "getFilePathId", "customParams": [this.filePathId, idOverride]});
 		if (this.filePathId == null) {
 			return this.getFilePath(idOverride).then(function (_) {
 				return _gthis.filePathId;
@@ -94,7 +92,9 @@ class SourceData extends Register.inherits() {
 	}
 	
 	/**
-	Path to a file for this source, relative to CWD.
+	* Path to a file for this source, relative to CWD.
+	* Useful for working with sources outside of Whet ecosystem.
+	* @param [idOverride] Use to change the name/directory of the file. Ignored if source already has a filepath.
 	*/
 	getFilePath(idOverride) {
 		var _gthis = this;
@@ -110,7 +110,6 @@ class SourceData extends Register.inherits() {
 				throw new Error("Badly formed SourceId.");
 			};
 			this.filePath = Path.posix.join(".", root, ".", this1);
-			Log.trace(dir, {"fileName": "src/whet/Source.hx", "lineNumber": 121, "className": "whet.SourceData", "methodName": "getFilePath", "customParams": [this.filePath, this.filePathId]});
 			return Utils.saveBytes(this.filePath, this.data).then(function (_) {
 				return _gthis.filePath;
 			});
@@ -129,7 +128,7 @@ class SourceData extends Register.inherits() {
 		return new Promise(function (res, rej) {
 			Fs.readFile(path, function (err, buffer) {
 				if (err != null) {
-					Log__1.log(50, ...["File does not exist.", {"id": id, "path": path}]);
+					Log.log(50, ...["File does not exist.", {"id": id, "path": path}]);
 					res(null);
 				} else {
 					var source = SourceData.fromBytes(id, buffer);

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.14", "-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.15", "-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/FileCache.js

@@ -94,7 +94,6 @@ class FileCache extends Register.inherits(BaseCache) {
 		if (_g._hx_index == 3) {
 			var _g1 = _g.path;
 			if (source.data.length == 1) {
-				console.log("src/whet/cache/FileCache.hx:46:",_g1);
 				var s = _g1.substring(_g1.lastIndexOf("/"));
 				var str = (s.length > 1 && HxOverrides.cca(s, 0) == 47) ? s.substring(1) : s;
 				if (str.length > 0) {
@@ -109,7 +108,6 @@ class FileCache extends Register.inherits(BaseCache) {
 		} else {
 			idOverride = null;
 		};
-		console.log("src/whet/cache/FileCache.hx:50:",idOverride);
 		var _g = [];
 		var _g1 = 0;
 		var _g2 = source.data;
@@ -118,9 +116,7 @@ class FileCache extends Register.inherits(BaseCache) {
 			++_g1;
 			_g.push(data[0].getFilePathId(idOverride).then((function (data) {
 				return function (filePath) {
-					var tmp = SourceHash.fromBytes(data[0].data);
-					console.log("src/whet/cache/FileCache.hx:53:",filePath);
-					return {"fileHash": tmp, "filePath": filePath, "id": data[0].id};
+					return {"fileHash": SourceHash.fromBytes(data[0].data), "filePath": filePath, "id": data[0].id};
 				};
 			})(data)));
 		};

package/bin/whet/route/RouteResult.js

@@ -1,4 +1,3 @@
-import {Log} from "../../haxe/Log.js"
 import {Register} from "../../genes/Register.js"
 
 const $global = Register.$global
@@ -13,16 +12,6 @@ class RouteResult extends Register.inherits() {
 	get() {
 		var _gthis = this;
 		return this.source.getSource().then(function (data) {
-			Log.trace("getting ", {"fileName": "src/whet/route/RouteResult.hx", "lineNumber": 17, "className": "whet.route.RouteResult", "methodName": "get", "customParams": [_gthis.sourceId, "has data:"]});
-			var _this = data.data;
-			var result = new Array(_this.length);
-			var _g = 0;
-			var _g1 = _this.length;
-			while (_g < _g1) {
-				var i = _g++;
-				result[i] = _this[i].id;
-			};
-			console.log("src/whet/route/RouteResult.hx:18:",result);
 			return data.get(_gthis.sourceId);
 		});
 	}

package/bin/whet/stones/Server.js

@@ -1,9 +1,8 @@
 import {Stone} from "../Stone.js"
-import {Log, Log as Log__2} from "../Log.js"
+import {Log} from "../Log.js"
 import * as Path from "path"
 import Mime from "mime"
 import * as Http from "http"
-import {Log as Log__1} from "../../haxe/Log.js"
 import {Register} from "../../genes/Register.js"
 import {StringTools} from "../../StringTools.js"
 import {Std} from "../../Std.js"
@@ -99,11 +98,7 @@ class Server extends Register.inherits(Stone) {
 				id = (HxOverrides.cca(s, 0) == 47) ? s : "/" + s;
 			};
 			this.config.router.find(id).then(function (routeResult) {
-				Log__1.trace("result for ", {"fileName": "src/whet/stones/Server.hx", "lineNumber": 60, "className": "whet.stones.Server", "methodName": "handler", "customParams": [id]});
-				console.log("src/whet/stones/Server.hx:61:",routeResult);
 				return ((routeResult.length > 0) ? routeResult[0].get() : (_gthis.routeDynamic != null) ? _gthis.routeDynamic(id) : Promise.resolve(null)).then(function (source) {
-					Log__1.trace("Source for ", {"fileName": "src/whet/stones/Server.hx", "lineNumber": 66, "className": "whet.stones.Server", "methodName": "handler", "customParams": [id]});
-					console.log("src/whet/stones/Server.hx:67:",source);
 					if (source == null) {
 						res.writeHead(404, "File not found.");
 						res.end();

package/package.json

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