whet 0.6.1 → 0.6.3

package/bin/whet/Whet.js

@@ -26,7 +26,7 @@ class Whet_Fields_ {
 		if (entryUrl != thisUrl) {
 			return;
 		};
-		Whet_Fields_.program.enablePositionalOptions().passThroughOptions().description("Project tooling.").usage("[options] [command] [+ [command]...]").version("0.6.1", "-v, --version").allowUnknownOption(true).allowExcessArguments(true).showSuggestionAfterError(true).helpOption(false).option("-p, --project <file>", "project to run", "Project.mjs").addOption(new Option("-l, --log-level <level>", "log level, a string/number")["default"]("info").env("WHET_LOG_LEVEL")).option("--no-pretty", "disable pretty logging").option("-q, --quiet", "quiet output: warn level + no color (the default when stdout is not a TTY)").option("--profile <format>", "enable profiling, export to whet-profile.json on exit (format: json or trace, default: json)").exitOverride();
+		Whet_Fields_.program.enablePositionalOptions().passThroughOptions().description("Project tooling.").usage("[options] [command] [+ [command]...]").version("0.6.3", "-v, --version").allowUnknownOption(true).allowExcessArguments(true).showSuggestionAfterError(true).helpOption(false).option("-p, --project <file>", "project to run", "Project.mjs").addOption(new Option("-l, --log-level <level>", "log level, a string/number")["default"]("info").env("WHET_LOG_LEVEL")).option("--no-pretty", "disable pretty logging").option("-q, --quiet", "quiet output: warn level + no color (the default when stdout is not a TTY)").option("--profile <format>", "enable profiling, export to whet-profile.json on exit (format: json or trace, default: json)").exitOverride();
 		try {
 			Whet_Fields_.program.parse();
 		}catch (_g) {
@@ -79,6 +79,7 @@ class Whet_Fields_ {
 					if (((e) instanceof Error)) {
 						Log.log(50, ...[e.stack]);
 					};
+					process.exitCode = 1;
 				};
 				try {
 					Whet_Fields_.program.help();
@@ -159,6 +160,7 @@ class Whet_Fields_ {
 					return;
 				};
 				Log.log(50, ...["Error while executing command.", {"error": err}]);
+				process.exitCode = 1;
 			});
 		};
 		initProm.then(function (_) {

package/bin/whet/route/OutputFilterMatcher.d.ts

@@ -22,7 +22,7 @@ export declare class OutputFilterMatcher {
 	* "title.png.meta.json" → "png.meta.json"
 	* Returns null if no extension or contains wildcard.
 	*/
-	protected static getExtension(path: string): null | string
+	static getExtension(path: string): null | string
 	
 	/**
 	* Check if query extension matches any filter extension.

package/bin/whet/route/Router.js

@@ -89,9 +89,10 @@ class Router extends Register.inherits() {
 					result[i] = {"filter": f.filter, "pathSoFar": f.pathSoFar, "inProgress": f.inProgress, "remDirs": f.remDirs};
 				};
 				let routeFilters = result;
-				let possible;
 				let id = route.routeUnder;
-				if (id.length == 0 || id.charCodeAt(id.length - 1) == 47) {
+				let isDirMount = id.length == 0 || id.charCodeAt(id.length - 1) == 47;
+				let possible;
+				if (isDirMount) {
 					let this1 = routeFilters;
 					let dir = route.routeUnder;
 					if (dir.length == 0 || dir == "./") {
@@ -174,16 +175,18 @@ class Router extends Register.inherits() {
 					};
 					routeFilters.push({"pathSoFar": [], "filter": f, "inProgress": true, "remDirs": []});
 				};
-				let outputFilter = null;
-				if (((route.source) instanceof Stone)) {
-					outputFilter = route.source.getOutputFilter();
-				} else if (((route.source) instanceof Router)) {
-					outputFilter = route.source.getOutputFilter();
-				};
-				if (outputFilter != null) {
-					let queryPattern = (routeFilters.length > 0 && routeFilters[0].filter != null) ? routeFilters[0].filter.pattern : null;
-					if (queryPattern != null && !OutputFilterMatcher.couldMatch(queryPattern, outputFilter, queryIsPattern)) {
-						continue;
+				if (isDirMount) {
+					let outputFilter = null;
+					if (((route.source) instanceof Stone)) {
+						outputFilter = route.source.getOutputFilter();
+					} else if (((route.source) instanceof Router)) {
+						outputFilter = route.source.getOutputFilter();
+					};
+					if (outputFilter != null) {
+						let queryPattern = (routeFilters.length > 0 && routeFilters[0].filter != null) ? routeFilters[0].filter.pattern : null;
+						if (queryPattern != null && !OutputFilterMatcher.couldMatch(queryPattern, outputFilter, queryIsPattern)) {
+							continue;
+						};
 					};
 				};
 				let prom;
@@ -395,11 +398,24 @@ class Router extends Register.inherits() {
 		let allExtensions = new Array();
 		let allPatterns = new Array();
 		let hasUnfiltered = false;
+		let hasExtensionlessChild = false;
+		let hasPatternlessChild = false;
 		let _g = 0;
 		let _g1 = this.routes;
 		while (_g < _g1.length) {
 			let route = _g1[_g];
 			++_g;
+			let id = route.routeUnder;
+			if (!(id.length == 0 || id.charCodeAt(id.length - 1) == 47)) {
+				allPatterns.push(route.routeUnder);
+				let ext = OutputFilterMatcher.getExtension(route.routeUnder);
+				if (ext != null) {
+					if (allExtensions.indexOf(ext) == -1) {
+						allExtensions.push(ext);
+					};
+				};
+				continue;
+			};
 			let childFilter = null;
 			if (((route.source) instanceof Stone)) {
 				childFilter = route.source.getOutputFilter();
@@ -418,6 +434,8 @@ class Router extends Register.inherits() {
 					++_g;
 					if (allExtensions.indexOf(ext) == -1) {
 						allExtensions.push(ext);
+					} else {
+						hasExtensionlessChild = true;
 					};
 				};
 			};
@@ -428,12 +446,14 @@ class Router extends Register.inherits() {
 					let prefixed = Path.posix.join(route.routeUnder, _g1[_g++]);
 					allPatterns.push(prefixed);
 				};
+			} else {
+				hasPatternlessChild = true;
 			};
 		};
 		if (hasUnfiltered) {
 			return null;
 		};
-		return {"extensions": (allExtensions.length > 0) ? allExtensions : null, "patterns": (allPatterns.length > 0) ? allPatterns : null};
+		return {"extensions": (!hasExtensionlessChild && allExtensions.length > 0) ? allExtensions : null, "patterns": (!hasPatternlessChild && allPatterns.length > 0) ? allPatterns : null};
 	}
 	static get __name__() {
 		return "whet.route.Router"

package/package.json

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