@trenskow/app 0.5.8 → 0.5.12

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';
@@ -256,7 +258,7 @@ export default class Application extends EventEmitter {
 					({ error, brutally } = error);
 				}
 
-				if (!['completed', 'aborted'].includes(state)) {
+				if (!['completed', 'aborted', 'ignored'].includes(state)) {
 					state = 'aborted';
 					if (error) context.result = error;
 				}
@@ -269,6 +271,11 @@ export default class Application extends EventEmitter {
 					});
 				}
 
+			},
+			ignore: () => {
+				if (!['completed', 'aborted', 'ignored'].includes(state)) {
+					state = 'ignored';
+				}
 			}
 
 		};
@@ -321,6 +328,8 @@ export default class Application extends EventEmitter {
 					});
 			});
 
+			if (state === 'ignored') return;
+
 			if (context.response.statusCode === 200) {
 				context.response.statusCode = typeof context.result !== 'undefined' ? 200 : 204;
 			}

package/lib/endpoint.js

@@ -121,6 +121,10 @@ export default class Endpoint extends Router {
 
 		endpoint = resolveInlineImport(endpoint);
 
+		if (typeof transform !== 'undefined' && typeof transform !== 'function') {
+			throw new Error('Transforms must be a function.');
+		}
+
 		if (!(endpoint instanceof Endpoint)) {
 			throw new Error('Endpoints must be of type Endpoint');
 		}
@@ -174,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) {
+
+			if (path.isLast) {
 
-			const methods = this._layers
-				.filter((layer) => layer.type === 'method')
-				.map((layer) => layer.method.toUpperCase())
-				.filter((value, index, array) => array.indexOf(value) === index);
+				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();
+				}
 
-			if (methods.length) {
-				context.response.headers.allow = methods.join(', ');
-				throw new ApiError.MethodNotAllowed();
+			} else {
+				throw new ApiError.NotFound();
 			}
 
 		}
@@ -214,8 +224,14 @@ 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);
@@ -233,12 +249,16 @@ export default class Endpoint extends Router {
 
 					if (!component) return await path.popped(next);
 
-					context.parameters[layer.name] = await layer.transform?.(
-						Object.fromEntries([
-							[ 'context', context ],
-							[ layer.name, component ]
-						])
-					) || component;
+					context.parameters[layer.name] = component;
+
+					if (typeof layer.transform === 'function') {
+						context.parameters[layer.name] = await layer.transform(
+							Object.fromEntries([
+								['context', context],
+								[layer.name, component]
+							])
+						);
+					}
 
 					return await layer.endpoint._route(path, context, next);
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trenskow/app",
-  "version": "0.5.8",
+  "version": "0.5.12",
   "description": "A small HTTP router.",
   "type": "module",
   "main": "index.js",

package/test/index.js

@@ -74,6 +74,19 @@ 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(