@trenskow/app 0.9.4 → 0.9.5

package/lib/application.js

@@ -17,7 +17,7 @@ import Request from './request.js';
 import Response from './response.js';
 import Endpoint from './endpoint.js';
 
-import { isObject } from './util/index.js';
+import { isObject } from './util.js';
 
 export default class Application extends EventEmitter {
 

package/lib/endpoint.js

@@ -10,47 +10,36 @@ import ApiError from '@trenskow/api-error';
 
 import Router from './router.js';
 
-import { isObject, matchPath, resolveInlineImport, Methods } from './util/index.js';
+import { isObject, matchPath, resolveInlineImport, methods } from './util.js';
 
 export default class Endpoint extends Router {
 
 	constructor() {
 		super();
 
-		Methods.all.forEach((method) => {
+		methods.concat(['all']).forEach((method) => {
 
-			Object.defineProperty(this, method, {
-				get: () => new Methods({
-					existing: [method],
-					additional: ['catchAll'],
-					todo: (methods, ...handlers) => {
+			this[method] = (...handlers) => {
+				handlers = [].concat(...handlers);
+				return this._on(method, handlers);
+			};
 
-						handlers = [].concat(...handlers);
-
-						let match = 'direct';
-
-						if (methods.includes('catchAll')) {
-							match = 'indirect';
-							methods = methods.filter((method) => method !== 'catchAll');
-						}
-
-						return this._on(methods, handlers, match);
-
-					}
-				})
-			});
+			this[method].catchAll = (...handlers) => {
+				handlers = [].concat(...handlers);
+				return this._on(method, handlers, 'indirect');
+			};
 
 		});
 
 	}
 
-	_on(methods, handlers, match) {
+	_on(method, handlers, match) {
 
-		methods.forEach((method) => {
-			if (!Methods.all.includes(method)) {
-				throw new Error(`Method ${method} is unknown.`);
-			}
-		});
+		method = method.toLowerCase();
+
+		if (!methods.concat(['all']).includes(method)) {
+			throw new Error(`Method ${method} is unknown.`);
+		}
 
 		match = match || 'direct';
 
@@ -67,16 +56,16 @@ export default class Endpoint extends Router {
 		}
 
 		const existing = this._layers.findIndex((layer) => {
-			return (layer.handler === this._handleMethod && methods.some((method) => layer.methods.includes(method)));
+			return layer.method === method && layer.handler === this._handleMethod;
 		});
 
 		if (existing !== -1) {
-			throw new Error('Endpoint already has a handler.');
+			throw new Error(`Endpoint already has a \`${method}\` handler.`);
 		}
 
 		this._layers.push({
 			handler: this._handleMethod,
-			methods,
+			method,
 			handlers,
 			match
 		});
@@ -85,10 +74,6 @@ export default class Endpoint extends Router {
 
 	}
 
-	all(...handlers) {
-		return this._on(Methods.all, handlers);
-	}
-
 	mount(path, endpoint) {
 
 		if (isObject(path)) {
@@ -115,10 +100,10 @@ export default class Endpoint extends Router {
 	}
 
 	get mounts() {
-		return new Proxy(this, {
-			get: (target, path) => {
+		return new Proxy({}, {
+			get: (_, path) => {
 				return (endpoint) => {
-					return target.mount(path, endpoint);
+					return this.mount(path, endpoint);
 				};
 			}
 		});
@@ -198,11 +183,11 @@ export default class Endpoint extends Router {
 
 				const methods = this._layers
 					.filter((layer) => layer.handler === this._handleMethod)
-					.reduce((methods, layer) => methods.concat(layer.methods), [])
+					.map((layer) => layer.method.toUpperCase())
 					.filter((value, index, array) => array.indexOf(value) === index);
 
 				if (methods.length) {
-					context.response.headers.allow = methods.map((method) => method.toUpperCase()).join(', ');
+					context.response.headers.allow = methods.join(', ');
 					throw new ApiError.MethodNotAllowed();
 				}
 
@@ -236,12 +221,12 @@ export default class Endpoint extends Router {
 
 		let underlyingMethod = context.request.method.toLowerCase();
 
-		if (underlyingMethod === 'head' && !this._layers.some((layer) => layer.methods.includes('head'))) {
+		if (underlyingMethod === 'head' && !this._layers.some((layer) => layer.method === 'head')) {
 			underlyingMethod = 'get';
 		}
 
 		if (layer.match === 'direct' && !path.isLast) return await next();
-		if (!layer.methods.includes(underlyingMethod)) return await next();
+		if (layer.method !== 'all' && layer.method !== underlyingMethod) return await next();
 
 		for (let handler of layer.handlers) {
 			const result = await handler(context);

package/lib/index.js

@@ -1,10 +1,10 @@
 //
 // index.js
 // @trenskow/app
-//
+// 
 // Created by Kristian Trenskow on 2021/11/07
 // For license see LICENSE.
-//
+// 
 
 import Router from './router.js';
 import Endpoint from './endpoint.js';
@@ -13,7 +13,7 @@ import Request from './request.js';
 import Response from './response.js';
 import ApiError from '@trenskow/api-error';
 
-import { isObject, matchPath, resolveInlineImport } from './util/index.js';
+import { isObject, matchPath, resolveInlineImport } from './util.js';
 
 export default Application;
 

package/lib/router.js

@@ -9,8 +9,10 @@
 import {
 	isObject,
 	resolveInlineImport,
-	Methods
-} from './util/index.js';
+	methods,
+	methodsRead,
+	methodsWrite
+} from './util.js';
 
 export default class Router {
 
@@ -18,9 +20,27 @@ export default class Router {
 
 		this._layers = [];
 
+		methods.forEach((method) => {
+			return this.use[method] = (...handlers) => {
+				return this.#_use(handlers, method);
+			};
+		});
+
+		this.use.read = (...handlers) => {
+			methodsRead.forEach((method) => {
+				return this.#_use(handlers, method);
+			});
+		};
+
+		this.use.write = (...handlers) => {
+			methodsWrite.forEach((method) => {
+				return this.#_use(handlers, method);
+			});
+		};
+
 	}
 
-	#_use(handlers, methods) {
+	#_use(handlers, method) {
 
 		handlers = [].concat(...handlers);
 
@@ -35,19 +55,15 @@ export default class Router {
 		this._layers.push({
 			handler: this._handleUse,
 			handlers,
-			methods
+			method
 		});
 
 		return this;
 
 	}
 
-	get use() {
-		return new Methods({
-			todo: (methods, ...handlers) => {
-				return this.#_use(handlers, methods);
-			}
-		});
+	use(...handlers) {
+		return this.#_use(handlers, 'all');
 	}
 
 	mixin(router) {
@@ -111,7 +127,7 @@ export default class Router {
 
 		const { request } = context;
 
-		if (layer.methods.length === 0 || layer.methods.includes(request.method.toLowerCase())) {
+		if (layer.method === 'all' || request.method.toLowerCase() === layer.method) {
 
 			for (let handler of layer.handlers) {
 				await handler(context);

package/lib/{util/index.js → util.js}

@@ -6,9 +6,13 @@
 // For license see LICENSE.
 //
 
+import { METHODS } from 'http';
+
 import caseit from '@trenskow/caseit';
 
-import Methods from './methods.js';
+const methods = METHODS.map((method) => method.toLowerCase());
+const methodsWrite = ['post', 'put', 'patch', 'delete'];
+const methodsRead = methods.filter((method) => !methodsWrite.includes(method));
 
 const isObject = (value) => value?.constructor === Object;
 
@@ -23,7 +27,9 @@ const resolveInlineImport = (value) => {
 };
 
 export {
-	Methods,
+	methods,
+	methodsWrite,
+	methodsRead,
 	isObject,
 	matchPath,
 	resolveInlineImport

package/package.json

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

package/test/index.js

@@ -50,7 +50,9 @@ describe('Application', () => {
 		it ('should respond with 405 when a route is configured, but request method is not specified,', async () => {
 			app.root(
 				new Endpoint()
-					.post.put.delete(() => {})
+					.post(() => {})
+					.put(() => {})
+					.delete(() => {})
 			);
 			await request
 				.get('/')
@@ -107,7 +109,7 @@ describe('Application', () => {
 				new Endpoint()
 					.get(() => 'Hello, World!')
 					.get(() => 'Hello, World! (2)');
-			}).to.throw('Endpoint already has a handler.');
+			}).to.throw('Endpoint already has a `get` handler.');
 		});
 
 		it ('should ignore GET method handler when path has been rewritten and respond with 200 and `Hello, World!`.', async () => {
@@ -281,7 +283,7 @@ describe('Application', () => {
 
 		});
 
-		it ('should respond with a value when using PUT on a all handler.', async () => {
+		it ('should respond with a value when using PUT on a catch-all method.', async () => {
 
 			app.root(
 				new Endpoint()

package/lib/util/methods.js

@@ -1,49 +0,0 @@
-//
-// is-object.js
-// @trenskow/app
-//
-// Created by Kristian Trenskow on 2025/01/02
-// For license see LICENSE.
-//
-
-import { METHODS } from 'http';
-
-const methods = METHODS.map((method) => method.toLowerCase());
-
-export default class Methods extends Function {
-
-	static get all() {
-		return methods;
-	}
-
-	constructor({ existing = [], additional = [], todo }) {
-		super();
-
-		if (!Array.isArray(existing)) {
-			throw new Error('Existing must be an array.');
-		}
-
-		let methods = existing;
-
-		return new Proxy(this, {
-			get: (_ /* target */, property, receiver) => {
-
-				if (property === 'all') {
-					methods = Methods.all;
-				} else if (Methods.all.concat(additional).includes(property)) {
-					if (!methods.includes(property)) methods.push(property);
-				} else {
-					throw new Error(`Method ${property} is unknown.`);
-				}
-
-				return receiver;
-
-			},
-			apply: (_ /* target */, __ /* this */, args) => {
-				return todo(methods, ...args);
-			}
-		});
-
-	}
-
-}