@trenskow/app 0.5.10 → 0.5.13

package/README.md

@@ -497,6 +497,8 @@ Supported HTTP methods are the same as those returned by [`http.METHODS`](https:
 
 You can only call these methods once per method per endpoint – calling it multiple times will result in only the last one getting used.
 
+These also ends routing. After a method route has been called, the routing will go strait to the renderer.
+
 > Returns the endpoint.
 
 ###### Parameters
@@ -505,7 +507,7 @@ You can only call these methods once per method per endpoint – calling it mult
 | ---------- | ------------------------------ | :------------------------------------------------------: | :----------------: | :-----------: |
 | `handlers` | A (or an array of) handlers. * | Function, AsyncFunction or Array ([see also](#handlers)) | :white_check_mark: |               |
 
-> \* When more than one handler are provided all but the last are treated as `.use` handlers (but specific to the HTTP method). Only the return value of the last handler is sent to the renderer.
+> \* When more than one handler is provided only the return value of the last handler that returned a non-undefined value will be send the the renderer.
 
 ###### Example
 

package/lib/application.js

@@ -64,8 +64,10 @@ export default class Application extends EventEmitter {
 		this.#_rootEndpoint = new Endpoint()
 			.use(() => { throw new ApiError.NotFound(); });
 
-		this.#_renderer = async ({ result, response }) => {
-			if (result instanceof ApiError) {
+		this.#_renderer = async ({ result, request, response }) => {
+			if (request.method.toLowerCase() === 'head') {
+				response.end();
+			} else if (result instanceof ApiError) {
 				response.end();
 			} else if (typeof result === 'string') {
 				response.headers.contentType = 'text/plain; charset=utf-8';

package/lib/endpoint.js

@@ -178,16 +178,22 @@ export default class Endpoint extends Router {
 
 	async _route(path, context, next, idx = 0) {
 
-		if (idx === this._layers.length && path.isLast) {
+		if (idx === this._layers.length) {
 
-			const methods = this._layers
-				.filter((layer) => layer.type === 'method')
-				.map((layer) => layer.method.toUpperCase())
-				.filter((value, index, array) => array.indexOf(value) === index);
+			if (path.isLast) {
 
-			if (methods.length) {
-				context.response.headers.allow = methods.join(', ');
-				throw new ApiError.MethodNotAllowed();
+				const methods = this._layers
+					.filter((layer) => layer.type === 'method')
+					.map((layer) => layer.method.toUpperCase())
+					.filter((value, index, array) => array.indexOf(value) === index);
+
+				if (methods.length) {
+					context.response.headers.allow = methods.join(', ');
+					throw new ApiError.MethodNotAllowed();
+				}
+
+			} else {
+				throw new ApiError.NotFound();
 			}
 
 		}
@@ -218,13 +224,19 @@ export default class Endpoint extends Router {
 
 			case 'method': {
 
+				let underlyingMethod = context.request.method.toLowerCase();
+
+				if (underlyingMethod === 'head') {
+					underlyingMethod = 'get';
+				}
+
 				if (layer.match === 'direct' && !path.isLast) return await next();
-				if (layer.method !== 'all' && layer.method !== context.request.method.toLowerCase()) return await next();
+				if (layer.method !== 'all' && layer.method !== underlyingMethod) return await next();
 
 				for (let handler of layer.handlers) {
 					const result = await handler(context);
 					if (context.state !== 'routing') return;
-					context.result = result;
+					if (typeof result !== 'undefined') context.result = result;
 				}
 
 				return context.result;
@@ -242,8 +254,8 @@ export default class Endpoint extends Router {
 					if (typeof layer.transform === 'function') {
 						context.parameters[layer.name] = await layer.transform(
 							Object.fromEntries([
-								[ 'context', context ],
-								[ layer.name, component ]
+								['context', context],
+								[layer.name, component]
 							])
 						);
 					}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trenskow/app",
-  "version": "0.5.10",
+  "version": "0.5.13",
   "description": "A small HTTP router.",
   "type": "module",
   "main": "index.js",
@@ -25,12 +25,12 @@
   },
   "homepage": "https://github.com/trenskow/app#readme",
   "devDependencies": {
-    "eslint": "^8.2.0",
-    "mocha": "^9.1.3",
-    "supertest": "^6.1.6"
+    "eslint": "^8.13.0",
+    "mocha": "^9.2.2",
+    "supertest": "^6.2.2"
   },
   "dependencies": {
-    "@trenskow/api-error": "^2.2.4",
-    "@trenskow/caseit": "^1.1.1"
+    "@trenskow/api-error": "^2.2.5",
+    "@trenskow/caseit": "^1.1.3"
   }
 }

package/test/index.js

@@ -74,13 +74,28 @@ describe('Application', () => {
 
 		});
 
+		it ('should respond with 200 and no content when a GET method is configured and HEAD is requested.', async () => {
+
+			app.root(
+				new Endpoint()
+					.get(() => 'Hello, World!')
+			);
+
+			await request
+				.head('/')
+				.expect(200, undefined);
+
+		});
+
 		it ('should ignore multiple GET method handlers and respond with 200 and `Hello, World!`.', async () => {
 
 			app.root(
 				new Endpoint()
 					.get(() => 'Ignore this!')
 					.post(() => 'Not used')
-					.get(() => 'Hello, World!')
+					.get(
+						() => 'Hello, World!',
+						() => { /* Ignore this */ })
 			);
 
 			await request