@nattyjs/core 0.0.1-beta.65 → 0.0.1-beta.66

package/dist/index.cjs

@@ -211,8 +211,10 @@ function setupLegacyTypes(types) {
 function defaultResolver(path) {
   if (typeof path === "function")
     return path();
-  if (typeof path === "string")
-    return require(path);
+  if (typeof path === "string") {
+    const normalizedPath = path.startsWith("/") ? `.${path}` : path;
+    return require(normalizedPath);
+  }
   return {};
 }
 function initializeModule(config) {
@@ -562,6 +564,15 @@ class BaseResponse {
   notFound() {
     throw new HttpNotFoundException({});
   }
+  normalizeHttpResponse(result) {
+    if (result instanceof HttpResponse)
+      return result;
+    if (result instanceof HttpException)
+      return result.getResponse();
+    if (result && typeof result === "object" && ("status" in result || "body" in result || "headers" in result || "cookies" in result || "isBuffer" in result))
+      return new HttpResponse(result);
+    return result;
+  }
 }
 
 function getTypedErrorMessage(type, value) {
@@ -935,11 +946,19 @@ class RouteParser extends ParameterTypeConverter {
     return this.parsedRequestUrl;
   }
   getRequestPathname(url) {
-    const apiRootPath = common.commonContainer.nattyConfig.api.rootPath;
-    let splitUrl = url.pathname.split(`${apiRootPath}/`);
-    if (splitUrl.length > 1)
-      return splitUrl[1];
-    return url.pathname;
+    const apiRootPath = String(common.commonContainer.nattyConfig.api.rootPath || "").replace(/^\/+|\/+$/g, "");
+    const normalizedPathname = url.pathname.replace(/^\/+/, "");
+    if (!apiRootPath) {
+      return normalizedPathname;
+    }
+    if (normalizedPathname === apiRootPath) {
+      return "";
+    }
+    const apiPrefix = `${apiRootPath}/`;
+    if (normalizedPathname.startsWith(apiPrefix)) {
+      return normalizedPathname.slice(apiPrefix.length);
+    }
+    return normalizedPathname;
   }
   getQueryParams(url) {
     const queryParams = {};
@@ -1573,11 +1592,11 @@ class Resolver extends RequestProcessor {
       if (onException) {
         const instance = this.resolveClass(onException);
         if (instance.onException)
-          result = instance.onException({
+          result = this.normalizeHttpResponse(instance.onException({
             error: ex,
             request: this.httpContext.request,
             routeInfo: this.routeInfo
-          });
+          }));
       } else
         result = new HttpException({
           body: { message: ex.message, stack: ex.stack },
@@ -1608,11 +1627,11 @@ class RequestHandler extends Resolver {
       if (onException) {
         const instance = this.resolveClass(onException);
         if (instance.onException)
-          return instance.onException({
+          return this.normalizeHttpResponse(instance.onException({
             error: ex,
             request: this.httpContext.request,
             routeInfo: this.routeInfo
-          });
+          }));
       } else
         return new HttpException({
           body: {

package/dist/index.d.ts

@@ -402,6 +402,7 @@ declare abstract class BaseResponse {
     badRequest(): void;
     success(body: any): HttpResponse;
     notFound(): void;
+    protected normalizeHttpResponse(result: any): any;
 }
 
 declare abstract class ParameterTypeConverter extends BaseResponse {

package/dist/index.mjs

@@ -205,8 +205,10 @@ function setupLegacyTypes(types) {
 function defaultResolver(path) {
   if (typeof path === "function")
     return path();
-  if (typeof path === "string")
-    return require(path);
+  if (typeof path === "string") {
+    const normalizedPath = path.startsWith("/") ? `.${path}` : path;
+    return require(normalizedPath);
+  }
   return {};
 }
 function initializeModule(config) {
@@ -556,6 +558,15 @@ class BaseResponse {
   notFound() {
     throw new HttpNotFoundException({});
   }
+  normalizeHttpResponse(result) {
+    if (result instanceof HttpResponse)
+      return result;
+    if (result instanceof HttpException)
+      return result.getResponse();
+    if (result && typeof result === "object" && ("status" in result || "body" in result || "headers" in result || "cookies" in result || "isBuffer" in result))
+      return new HttpResponse(result);
+    return result;
+  }
 }
 
 function getTypedErrorMessage(type, value) {
@@ -929,11 +940,19 @@ class RouteParser extends ParameterTypeConverter {
     return this.parsedRequestUrl;
   }
   getRequestPathname(url) {
-    const apiRootPath = commonContainer.nattyConfig.api.rootPath;
-    let splitUrl = url.pathname.split(`${apiRootPath}/`);
-    if (splitUrl.length > 1)
-      return splitUrl[1];
-    return url.pathname;
+    const apiRootPath = String(commonContainer.nattyConfig.api.rootPath || "").replace(/^\/+|\/+$/g, "");
+    const normalizedPathname = url.pathname.replace(/^\/+/, "");
+    if (!apiRootPath) {
+      return normalizedPathname;
+    }
+    if (normalizedPathname === apiRootPath) {
+      return "";
+    }
+    const apiPrefix = `${apiRootPath}/`;
+    if (normalizedPathname.startsWith(apiPrefix)) {
+      return normalizedPathname.slice(apiPrefix.length);
+    }
+    return normalizedPathname;
   }
   getQueryParams(url) {
     const queryParams = {};
@@ -1567,11 +1586,11 @@ class Resolver extends RequestProcessor {
       if (onException) {
         const instance = this.resolveClass(onException);
         if (instance.onException)
-          result = instance.onException({
+          result = this.normalizeHttpResponse(instance.onException({
             error: ex,
             request: this.httpContext.request,
             routeInfo: this.routeInfo
-          });
+          }));
       } else
         result = new HttpException({
           body: { message: ex.message, stack: ex.stack },
@@ -1602,11 +1621,11 @@ class RequestHandler extends Resolver {
       if (onException) {
         const instance = this.resolveClass(onException);
         if (instance.onException)
-          return instance.onException({
+          return this.normalizeHttpResponse(instance.onException({
             error: ex,
             request: this.httpContext.request,
             routeInfo: this.routeInfo
-          });
+          }));
       } else
         return new HttpException({
           body: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nattyjs/core",
-  "version": "0.0.1-beta.65",
+  "version": "0.0.1-beta.66",
   "description": "",
   "keywords": [],
   "author": "ajayojha",
@@ -17,7 +17,7 @@
   "dependencies": {
     "reflect-metadata": "0.2.2",
     "path-to-regexp": "6.2.1",
-    "@nattyjs/common": "0.0.1-beta.65"
+    "@nattyjs/common": "0.0.1-beta.66"
   },
   "devDependencies": {
     "unbuild": "1.2.1"