@trenskow/app 0.6.14 → 0.7.2

package/.vscode/launch.json

@@ -5,7 +5,7 @@
 	"version": "0.2.0",
 	"configurations": [
 		{
-			"type": "pwa-node",
+			"type": "node",
 			"request": "launch",
 			"name": "Test",
 			"skipFiles": [

package/README.md

@@ -123,21 +123,26 @@ import { Application, Endpoint } from '@trenskow/app';
 
 const app = new Application({ port: 8080 });
 
-(async () => {
-
-	return (await app
-		.root(
-			new Endpoint()
-				.mount('iam', await import('./iam.js')))
-		.renderer(async ({ result, response }) => {
+try {
+  
+	const root = new Endpoint()
+  		.mount('iam', await import('./iam.js'));
+  
+	const renderer = async ({ result, response }) => {
 			response.headers.contentType = 'text/plain';
 			response.end(result);
-		})
-		.start())
-		.port;
-
-})().then((port) => console.info(`Application is running on port ${app.port}`))
-	.catch(console.error);
+	};
+  
+	await app
+		.root(root)
+		.renderer(renderer)
+		.start();
+  
+	console.info(`Application is running on port ${app.port}`)
+  
+} catch (error) {
+	console.error(error);
+}
 ````
 
 ````javascript
@@ -510,8 +515,8 @@ Below is an example on how to use the method.
 default export ({ endpoint }) => {  
 	endpoint
 		.get(
-            async (context) => 'Hello, world!',
-            () => console.info("Said hello."));
+			async (context) => 'Hello, world!',
+			() => console.info("Said hello."));
 };
 ````
 

package/lib/endpoint.js

@@ -65,7 +65,7 @@ export default class Endpoint extends Router {
 		}
 
 		this._layers.push({
-			type: 'method',
+			handler: this._handleMethod,
 			method,
 			handlers,
 			match
@@ -91,7 +91,7 @@ export default class Endpoint extends Router {
 		}
 
 		this._layers.push({
-			type: 'mount',
+			handler: this._handleMount,
 			path,
 			endpoint
 		});
@@ -130,7 +130,7 @@ export default class Endpoint extends Router {
 		}
 
 		this._layers.push({
-			type: 'parameter',
+			handler: this._handleParameter,
 			name,
 			transform,
 			endpoint
@@ -168,7 +168,7 @@ export default class Endpoint extends Router {
 		}
 
 		this._layers.push({
-			type: 'middleware',
+			handler: this._handleMiddleware,
 			router
 		});
 
@@ -183,7 +183,7 @@ export default class Endpoint extends Router {
 			if (path.isLast) {
 
 				const methods = this._layers
-					.filter((layer) => layer.type === 'method')
+					.filter((layer) => layer.handler === this._handleMethod)
 					.map((layer) => layer.method.toUpperCase())
 					.filter((value, index, array) => array.indexOf(value) === index);
 
@@ -202,80 +202,69 @@ export default class Endpoint extends Router {
 
 	}
 
-	async _handle(layer, path, context, next) {
+	async _handleMount(layer, path, context, next) {
 
-		switch (layer.type) {
+		return await path.pushed(async (component) => {
 
-			case 'mount': {
-
-				return await path.pushed(async (component) => {
-
-					if (!component) return path.popped(next);
-
-					if (matchPath(component, layer.path, context)) {
-						return await layer.endpoint._route(path, context, next);
-					}
-
-					return path.popped(next);
-
-				});
+			if (!component) return path.popped(next);
 
+			if (matchPath(component, layer.path, context)) {
+				return await layer.endpoint._route(path, context, next);
 			}
 
-			case 'method': {
+			return path.popped(next);
 
-				let underlyingMethod = context.request.method.toLowerCase();
+		});
 
-				if (underlyingMethod === 'head' && !this._layers.some((layer) => layer.method === 'head')) {
-					underlyingMethod = 'get';
-				}
+	}
 
-				if (layer.match === 'direct' && !path.isLast) return await next();
-				if (layer.method !== 'all' && layer.method !== underlyingMethod) return await next();
+	async _handleMethod(layer, path, context, next) {
 
-				for (let handler of layer.handlers) {
-					const result = await handler(context);
-					if (layer.underlyingMethod === 'head') return;
-					if (context.state !== 'routing') return;
-					if (typeof result !== 'undefined') context.result = result;
-				}
+		let underlyingMethod = context.request.method.toLowerCase();
 
-				return context.result;
+		if (underlyingMethod === 'head' && !this._layers.some((layer) => layer.method === 'head')) {
+			underlyingMethod = 'get';
+		}
 
-			}
+		if (layer.match === 'direct' && !path.isLast) return await next();
+		if (layer.method !== 'all' && layer.method !== underlyingMethod) return await next();
 
-			case 'parameter': {
+		for (let handler of layer.handlers) {
+			const result = await handler(context);
+			if (layer.underlyingMethod === 'head') return;
+			if (context.state !== 'routing') return;
+			if (typeof result !== 'undefined') context.result = result;
+		}
 
-				return await path.pushed(async (component) => {
+		return context.result;
 
-					if (!component) return await path.popped(next);
+	}
 
-					context.parameters[layer.name] = component;
+	async _handleParameter(layer, path, context, next) {
 
-					if (typeof layer.transform === 'function') {
-						context.parameters[layer.name] = await layer.transform(
-							Object.fromEntries([
-								['context', context],
-								[layer.name, component]
-							])
-						);
-					}
+		return await path.pushed(async (component) => {
 
-					return await layer.endpoint._route(path, context, next);
+			if (!component) return await path.popped(next);
 
-				});
+			context.parameters[layer.name] = component;
 
+			if (typeof layer.transform === 'function') {
+				context.parameters[layer.name] = await layer.transform(
+					Object.fromEntries([
+						['context', context],
+						[layer.name, component]
+					])
+				);
 			}
 
-			case 'middleware': {
-				return await layer.router._route(path, context, next);
-			}
+			return await layer.endpoint._route(path, context, next);
 
-			default:
-				return await super._handle(layer, path, context, next);
+		});
 
-		}
+	}
 
+	async _handleMiddleware(layer, path, context, next) {
+		return await layer.router._route(path, context, next);
 	}
 
 }

package/lib/index.js

@@ -13,6 +13,16 @@ import Request from './request.js';
 import Response from './response.js';
 import ApiError from '@trenskow/api-error';
 
+import { isObject, matchPath, resolveInlineImport } from './util.js';
+
 export default Application;
 
+Application.plugin = (plugin) => {
+	plugin({ Router, Endpoint, Application, Request, Response, Error: ApiError, util: {
+		isObject,
+		matchPath,
+		resolveInlineImport
+	} });
+};
+
 export { Router, Endpoint, Application, Request, Response, ApiError as Error };

package/lib/router.js

@@ -27,7 +27,7 @@ export default class Router {
 		}
 
 		this._layers.push({
-			type: 'use',
+			handler: this._handleUse,
 			handlers
 		});
 
@@ -48,7 +48,7 @@ export default class Router {
 		}
 
 		this._layers.push({
-			type: 'mixin',
+			handler: this._handleMixin,
 			router: router
 		});
 
@@ -68,27 +68,23 @@ export default class Router {
 
 	}
 
-	async _handle(layer, path, context, next) {
-
-		switch (layer.type) {
-
-			case 'use': {
+	async _handleUse(layer, _, context, next) {
 
-				for (let handler of layer.handlers) {
-					await handler(context);
-					if (context.state !== 'routing') return;
-				}
-
-				return await next();
+		for (let handler of layer.handlers) {
+			await handler(context);
+			if (context.state !== 'routing') return;
+		}
 
-			}
+		return await next();
 
-			case 'mixin': {
-				return await layer.router._route(path, context, next);
-			}
+	}
 
-		}
+	async _handleMixin(layer, path, context, next) {
+		return await layer.router._route(path, context, next);
+	}
 
+	async _handle(layer, path, context, next) {
+		return await layer.handler.call(this, layer, path, context, next);
 	}
 
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trenskow/app",
-  "version": "0.6.14",
+  "version": "0.7.2",
   "description": "A small HTTP router.",
   "type": "module",
   "main": "index.js",
@@ -25,12 +25,12 @@
   },
   "homepage": "https://github.com/trenskow/app#readme",
   "devDependencies": {
-    "eslint": "^8.13.0",
+    "eslint": "^8.20.0",
     "mocha": "^10.0.0",
-    "supertest": "^6.2.2"
+    "supertest": "^6.2.4"
   },
   "dependencies": {
-    "@trenskow/api-error": "^2.2.6",
+    "@trenskow/api-error": "^2.3.2",
     "@trenskow/caseit": "^1.3.0"
   }
 }