nestia 0.3.6 → 0.4.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nestia",
-  "version": "0.3.6",
+  "version": "0.4.0",
   "description": "Automatic SDK and Document generator for the NestJS",
   "main": "src/index.ts",
   "bin": {

package/src/analyses/ControllerAnalyzer.ts

@@ -104,6 +104,8 @@ export namespace ControllerAnalyzer
         let path: string = NodePath.join(controller.path, func.path).split("\\").join("/");
         if (path[0] !== "/")
             path = "/" + path;
+        if (path[path.length - 1] === "/" && path !== "/")
+            path = path.substr(0, path.length - 1);
 
         // RETURNS
         return {

package/src/analyses/ReflectAnalyzer.ts

@@ -1,4 +1,4 @@
-import * as path from "path";
+import Pather from "path";
 
 import { ArrayUtil } from "../utils/ArrayUtil";
 import { StringUtil } from "../utils/StringUtil";
@@ -128,7 +128,7 @@ export namespace ReflectAnalyzer
         }
 
         // VALIDATE PATH ARGUMENTS
-        const funcPathArguments: string[] = StringUtil.betweens(path.join(controller.path, meta.path).split("\\").join("/"), ":", "/").sort();
+        const funcPathArguments: string[] = StringUtil.betweens(Pather.join(controller.path, meta.path).split("\\").join("/"), ":", "/").sort();
         const paramPathArguments: string[] = meta.parameters.filter(param => param.category === "param").map(param => param.field!).sort();
 
         if (equal(funcPathArguments, paramPathArguments) === false)

package/src/generates/FunctionGenerator.ts

@@ -23,7 +23,7 @@ export namespace FunctionGenerator
     function body(route: IRoute, query: IRoute.IParameter | undefined, input: IRoute.IParameter | undefined): string
     {
         // FETCH ARGUMENTS WITH REQUST BODY
-        const [parameters] = get_path(route, query);
+        const parameters = filter_parameters(route, query);
         const fetchArguments: string[] = 
         [
             "connection",
@@ -43,20 +43,12 @@ export namespace FunctionGenerator
             + "}";
     }
 
-    function get_path(route: IRoute, query: IRoute.IParameter | undefined): [IRoute.IParameter[], string]
+    function filter_parameters(route: IRoute, query: IRoute.IParameter | undefined): IRoute.IParameter[]
     {
         const parameters = route.parameters.filter(param => param.category === "param");
-
-        let path: string = route.path;
-        for (const param of parameters)
-            path = path.replace(`:${param.field}`, `\${${param.name}}`);
-        path = (query !== undefined)
-            ? `\`${path}?\${new URLSearchParams(${query.name} as any).toString()}\``
-            : `\`${path}\``;
-
         if (query)
             parameters.push(query);
-        return [parameters, path];
+        return parameters;
     }
 
     /* ---------------------------------------------------------
@@ -142,6 +134,7 @@ export namespace FunctionGenerator
 
     function tail(route: IRoute, query: IRoute.IParameter | undefined, input: IRoute.IParameter | undefined): string | null
     {
+        // LIST UP TYPES
         const types: Pair<string, string>[] = [];
         if (query !== undefined)
             types.push(new Pair("Query", query.type));
@@ -150,17 +143,25 @@ export namespace FunctionGenerator
         if (route.output !== "void")
             types.push(new Pair("Output", route.output));
         
-        const [parameters, path] = get_path(route, query);
+        // PATH WITH PARAMETERS
+        const parameters = filter_parameters(route, query);
+        let path: string = route.path;
+        for (const param of parameters)
+            if (param.category === "param")
+                path = path.replace(`:${param.field}`, `\${${param.name}}`);
+        path = (query !== undefined)
+            ? `\`${path}?\${new URLSearchParams(${query.name} as any).toString()}\``
+            : `\`${path}\``;
+
         return `export namespace ${route.name}\n`
             + "{\n"
             + 
             (
                 types.length !== 0
-                    ? types.map(tuple => `    export type ${tuple.first} = Primitive<${tuple.second}>;`)
-                        .join("\n") 
-                        + "\n\n"
+                    ? types.map(tuple => `    export type ${tuple.first} = Primitive<${tuple.second}>;`).join("\n") + "\n\n"
                     : ""
             )
+            + "\n"
             + `    export const METHOD = "${route.method}";\n`
             + `    export const PATH = "${route.path}";\n`
             + `    export const CONFIG = {\n`