@adonisjs/http-server
Advanced tools
Comparing version 2.0.2 to 2.0.3
@@ -26,2 +26,3 @@ /// <reference types="node" /> | ||
route?: RouteNode; | ||
routeKey: string; | ||
params: any; | ||
@@ -28,0 +29,0 @@ subdomains: any; |
@@ -116,2 +116,6 @@ declare module '@ioc:Adonis/Core/Route' { | ||
route: RouteNode; | ||
/** | ||
* A unique key for the looked up route | ||
*/ | ||
routeKey: string; | ||
params: any; | ||
@@ -118,0 +122,0 @@ subdomains: any; |
@@ -22,2 +22,3 @@ /// <reference path="../../adonis-typings/index.d.ts" /> | ||
profiler: ProfilerRowContract; | ||
routeKey: string; | ||
params: any; | ||
@@ -24,0 +25,0 @@ subdomains: any; |
@@ -106,2 +106,6 @@ "use strict"; | ||
/** | ||
* Defining route key | ||
*/ | ||
ctx.routeKey = `${request.method()}-${ctx.route.pattern}`; | ||
/** | ||
* Attaching params to the ctx | ||
@@ -108,0 +112,0 @@ */ |
@@ -164,4 +164,5 @@ "use strict"; | ||
match(url, method, domain) { | ||
var _a; | ||
const matchedDomain = this.tree.domains[((_a = domain === null || domain === void 0 ? void 0 : domain.storeMatch[0]) === null || _a === void 0 ? void 0 : _a.old) || 'root']; | ||
const matchingDomain = domain && domain.storeMatch[0] && domain.storeMatch[0].old; | ||
const domainName = matchingDomain || 'root'; | ||
const matchedDomain = this.tree.domains[domainName]; | ||
if (!matchedDomain) { | ||
@@ -175,3 +176,3 @@ return null; | ||
*/ | ||
const matchedMethod = this.tree.domains[(domain === null || domain === void 0 ? void 0 : domain.storeMatch[0].old) || 'root'][method]; | ||
const matchedMethod = this.tree.domains[domainName][method]; | ||
if (!matchedMethod) { | ||
@@ -188,6 +189,10 @@ return null; | ||
} | ||
const route = matchedMethod.routes[matchedRoute[0].old]; | ||
return { | ||
route: matchedMethod.routes[matchedRoute[0].old], | ||
route: route, | ||
routeKey: matchingDomain | ||
? `${matchingDomain}-${method}-${route.pattern}` | ||
: `${method}-${route.pattern}`, | ||
params: matchit_1.default.exec(url, matchedRoute), | ||
subdomains: (domain === null || domain === void 0 ? void 0 : domain.value) ? matchit_1.default.exec(domain.value || 'root', domain.storeMatch) | ||
subdomains: (domain === null || domain === void 0 ? void 0 : domain.value) ? matchit_1.default.exec(domain.value, domain.storeMatch) | ||
: {}, | ||
@@ -194,0 +199,0 @@ }; |
@@ -60,2 +60,3 @@ "use strict"; | ||
ctx.route = route.route; | ||
ctx.routeKey = route.routeKey; | ||
} | ||
@@ -62,0 +63,0 @@ /** |
{ | ||
"name": "@adonisjs/http-server", | ||
"version": "2.0.2", | ||
"version": "2.0.3", | ||
"description": "AdonisJS HTTP server with support packed with Routing and Cookies", | ||
@@ -36,3 +36,3 @@ "main": "build/providers/HttpServerProvider.js", | ||
"@adonisjs/fold": "^6.3.5", | ||
"@adonisjs/logger": "^2.0.1", | ||
"@adonisjs/logger": "^2.0.3", | ||
"@adonisjs/mrm-preset": "^2.3.0", | ||
@@ -39,0 +39,0 @@ "@adonisjs/profiler": "^3.0.1", |
243014
6973