Fix: uses base path instead of __dirname

Author: danybeltran

README.md

@@ -11,18 +11,23 @@ Inside `/pages/api/auth/[...handler]`
 (filename must be a rest operator if you want customized URLs, but you can also use normal api handlers filenames, though they have to share the same URL in your controller)
 
 ```ts
+// inside /pages/api/auth/[...handler]
+
 import { Controller } from "next-rest-controller"
 
-const AuthHandler = Controller({
-    async "GET /auth"(req, res){
+// The first argument is the 'base' segment that will be used to map the correct url.
+const AuthHandler = Controller("/auth", {
+    async "GET /auth"(req, res) {
         res.status(401)
         res.send("Forbidden")
     },
-    async "GET /[id]/info"(req, res){
+    async "GET /[id]/info"(req, res) {
         res.send("Info for " + req.query.id)
     }
 })
-
 ```
 
+#### Explanation
+When adding a handler/method, it should start with an HTTP verb, followed by a space, and a url to handle (with or without query params using square brackets).
+
 Sending, for example, a POST request that would be handled by a GET handler, will send a `405` status code

lib/index.d.ts

@@ -2,5 +2,5 @@ import { NextApiRequest, NextApiResponse } from "next/types";
 declare type ControllerMethods = {
     [k: string]: (req: NextApiRequest, res: NextApiResponse) => void;
 };
-export declare function Controller(paths?: ControllerMethods): (req: NextApiRequest, res: NextApiResponse) => void;
+export declare function Controller(path: string, paths?: ControllerMethods): (req: NextApiRequest, res: NextApiResponse) => void;
 export {};

lib/index.js

@@ -12,16 +12,16 @@ var __assign = (this && this.__assign) || function () {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Controller = void 0;
-function Controller(paths) {
+function Controller(path, paths) {
     if (paths === void 0) { paths = {}; }
     return function (req, res) {
         var handled = false;
         var _a = req.url, url = _a === void 0 ? "" : _a;
         var urlWithourQueryParams = url.split("?")[0];
         var urlParts = urlWithourQueryParams.split("/");
-        var handlePathUrl = "/api/" + __dirname.split("/api/").at(-1);
-        var _loop_1 = function (path) {
-            var _b = path.split(" "), method = _b[0], handleUrl = _b[1];
+        var handlePathUrl = "/api" + path;
+        var _loop_1 = function (path_1) {
+            var _b = path_1.split(" "), method = _b[0], handleUrl = _b[1];
             var $handleUrl = handlePathUrl + handleUrl.split("?")[0];
             var handleParts = $handleUrl.split("/");
             var finalHandler = [];
@@ -40,16 +40,23 @@ function Controller(paths) {
                 var withQ = __assign(__assign({}, req.query), finalQuery);
                 if (req.method === method) {
                     req.query = withQ;
-                    paths[path](req, res);
+                    paths[path_1](req, res);
+                    handled = true;
                 }
                 else {
-                    res.status(405);
-                    res.send("Cannot ".concat(req.method, " ").concat(url));
+                    if (!("".concat(req.method, " ").concat(handleUrl) in paths)) {
+                        res.status(405);
+                        res.send("cannot ".concat(req.method, " ").concat(finalHandler.join("/")));
+                    }
                 }
             }
+            else {
+                res.status(404);
+                res.send("Not found");
+            }
         };
-        for (var path in paths) {
-            _loop_1(path);
+        for (var path_1 in paths) {
+            _loop_1(path_1);
         }
     };
 }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "next-rest-controller",
-  "version": "0.0.1",
+  "version": "0.0.2",
   "description": "A REST helper for Next apis",
   "main": "lib/index.js",
   "repository": "https://github.com/atomic-state/rest-next",

src/index.ts

@@ -4,16 +4,15 @@ type ControllerMethods = {
   [k: string]: (req: NextApiRequest, res: NextApiResponse) => void
 }
 
-export function Controller(paths: ControllerMethods = {}) {
+export function Controller(path: string, paths: ControllerMethods = {}) {
   return (req: NextApiRequest, res: NextApiResponse) => {
     let handled = false
-
     const { url = "" } = req
     const [urlWithourQueryParams] = url.split("?")
 
     const urlParts = urlWithourQueryParams.split("/")
 
-    const handlePathUrl = "/api/" + __dirname.split("/api/").at(-1)
+    const handlePathUrl = "/api" + path
 
     for (let path in paths) {
       const [method, handleUrl] = path.split(" ")
@@ -45,11 +44,17 @@ export function Controller(paths: ControllerMethods = {}) {
           req.query = withQ
 
           paths[path](req, res)
-        } else {
-          res.status(405)
 
-          res.send(`Cannot ${req.method} ${url}`)
+          handled = true
+        } else {
+          if (!(`${req.method} ${handleUrl}` in paths)) {
+            res.status(405)
+            res.send(`cannot ${req.method} ${finalHandler.join("/")}`)
+          }
         }
+      } else {
+        res.status(404)
+        res.send(`Not found`)
       }
     }
   }