nestia 2.1.7 → 2.1.10

package/lib/generates/SwaggerGenerator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"SwaggerGenerator.d.ts","sourceRoot":"","sources":["../../src/generates/SwaggerGenerator.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,YAAY,CAAC;AAS5B,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAM9C,yBAAiB,gBAAgB,CACjC;IACI,SAAsB,QAAQ,CAEtB,OAAO,EAAE,EAAE,CAAC,WAAW,EACvB,MAAM,EAAE,cAAc,CAAC,QAAQ,EAC/B,SAAS,EAAE,MAAM,EAAE,GACpB,OAAO,CAAC,IAAI,CAAC,CAsCnB;CAgOJ"}
+{"version":3,"file":"SwaggerGenerator.d.ts","sourceRoot":"","sources":["../../src/generates/SwaggerGenerator.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,YAAY,CAAC;AAS5B,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAO9C,yBAAiB,gBAAgB,CACjC;IACI,SAAsB,QAAQ,CAEtB,OAAO,EAAE,EAAE,CAAC,WAAW,EACvB,MAAM,EAAE,cAAc,CAAC,QAAQ,EAC/B,SAAS,EAAE,MAAM,EAAE,GACpB,OAAO,CAAC,IAAI,CAAC,CA6CnB;CAgOJ"}

package/lib/generates/SwaggerGenerator.js

@@ -91,10 +91,10 @@ var SwaggerGenerator;
 (function (SwaggerGenerator) {
     function generate(checker, config, routeList) {
         return __awaiter(this, void 0, void 0, function () {
-            var parsed, location, swagger, collection, pathDict, routeList_1, routeList_1_1, route, path, pathDict_1, pathDict_1_1, _a, path, routes;
-            var e_1, _b, e_2, _c;
-            return __generator(this, function (_d) {
-                switch (_d.label) {
+            var parsed, location, swagger, collection, pathDict, routeList_1, routeList_1_1, route, path, pathDict_1, pathDict_1_1, _a, path, routes, _b, _c, object;
+            var e_1, _d, e_2, _e, e_3, _f;
+            return __generator(this, function (_g) {
+                switch (_g.label) {
                     case 0:
                         parsed = path_1.default.parse(config.output);
                         location = !!parsed.ext
@@ -102,7 +102,7 @@ var SwaggerGenerator;
                             : path_1.default.join(path_1.default.resolve(config.output), "swagger.json");
                         return [4 /*yield*/, initialize(location)];
                     case 1:
-                        swagger = _d.sent();
+                        swagger = _g.sent();
                         collection = new MetadataCollection_1.MetadataCollection(false);
                         pathDict = new Map();
                         try {
@@ -115,7 +115,7 @@ var SwaggerGenerator;
                         catch (e_1_1) { e_1 = { error: e_1_1 }; }
                         finally {
                             try {
-                                if (routeList_1_1 && !routeList_1_1.done && (_b = routeList_1.return)) _b.call(routeList_1);
+                                if (routeList_1_1 && !routeList_1_1.done && (_d = routeList_1.return)) _d.call(routeList_1);
                             }
                             finally { if (e_1) throw e_1.error; }
                         }
@@ -129,14 +129,31 @@ var SwaggerGenerator;
                         catch (e_2_1) { e_2 = { error: e_2_1 }; }
                         finally {
                             try {
-                                if (pathDict_1_1 && !pathDict_1_1.done && (_c = pathDict_1.return)) _c.call(pathDict_1);
+                                if (pathDict_1_1 && !pathDict_1_1.done && (_e = pathDict_1.return)) _e.call(pathDict_1);
                             }
                             finally { if (e_2) throw e_2.error; }
                         }
+                        // CONSTRUCT COMPONENTS
                         swagger.components = SchemaFactory_1.SchemaFactory.components(collection.storage());
+                        try {
+                            for (_b = __values(Object.values(swagger.components.schemas)), _c = _b.next(); !_c.done; _c = _b.next()) {
+                                object = _c.value;
+                                if (object.$id)
+                                    delete object.$id;
+                            }
+                        }
+                        catch (e_3_1) { e_3 = { error: e_3_1 }; }
+                        finally {
+                            try {
+                                if (_c && !_c.done && (_f = _b.return)) _f.call(_b);
+                            }
+                            finally { if (e_3) throw e_3.error; }
+                        }
+                        // DO GENERATE
                         return [4 /*yield*/, fs_1.default.promises.writeFile(location, JSON.stringify(swagger, null, 2), "utf8")];
                     case 2:
-                        _d.sent();
+                        // DO GENERATE
+                        _g.sent();
                         return [2 /*return*/];
                 }
             });
@@ -178,7 +195,7 @@ var SwaggerGenerator;
         });
     }
     function get_path(path, parameters) {
-        var e_3, _a;
+        var e_4, _a;
         var filtered = parameters.filter(function (param) { return param.category === "param"
             && !!param.field; });
         try {
@@ -187,12 +204,12 @@ var SwaggerGenerator;
                 path = path.replace(":".concat(param.field), "{".concat(param.field, "}"));
             }
         }
-        catch (e_3_1) { e_3 = { error: e_3_1 }; }
+        catch (e_4_1) { e_4 = { error: e_4_1 }; }
         finally {
             try {
                 if (filtered_1_1 && !filtered_1_1.done && (_a = filtered_1.return)) _a.call(filtered_1);
             }
-            finally { if (e_3) throw e_3.error; }
+            finally { if (e_4) throw e_4.error; }
         }
         return path;
     }
@@ -228,7 +245,7 @@ var SwaggerGenerator;
     --------------------------------------------------------- */
     function generate_parameter(checker, collection, route, parameter) {
         return {
-            name: parameter.name,
+            name: parameter.field || parameter.name,
             in: parameter.category === "param"
                 ? "path"
                 : parameter.category,
@@ -240,7 +257,7 @@ var SwaggerGenerator;
     function generate_request_body(checker, collection, route, parameter) {
         return {
             description: warning.get(parameter.encrypted).get("request")
-                + get_parametric_description(route, "param", parameter.name) || "",
+                + (get_parametric_description(route, "param", parameter.name) || ""),
             content: {
                 "application/json": {
                     schema: generate_schema(checker, collection, parameter.type.metadata)
@@ -259,9 +276,9 @@ var SwaggerGenerator;
         var success = (_a = {},
             _a[status] = {
                 description: warning.get(route.encrypted).get("response", route.method)
-                    + get_parametric_description(route, "return")
-                    || get_parametric_description(route, "returns")
-                    || "",
+                    + (get_parametric_description(route, "return")
+                        || get_parametric_description(route, "returns")
+                        || ""),
                 content: route.output.escapedText === "void" ? undefined :
                     {
                         "application/json": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nestia",
-  "version": "2.1.7",
+  "version": "2.1.10",
   "description": "Automatic SDK and Document generator for the NestJS",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
@@ -41,7 +41,7 @@
     "tsconfig-paths": "^3.14.1",
     "tstl": "^2.5.6",
     "ttypescript": "^1.5.13",
-    "typescript": "^4.6.3",
+    "typescript": "^4.7.2",
     "typescript-is": "^0.19.0",
     "typescript-json": "^2.1.3",
     "typescript-transform-paths": "^3.3.1"