ng2-rest-swagger-generator 18.0.17 → 18.0.18

package/lib/helpers.js

@@ -1,28 +1,29 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.HelpersSwagger = void 0;
-var tslib_1 = require("tslib");
-var tnp_core_1 = require("tnp-core");
-var tnp_core_2 = require("tnp-core");
-var tnp_helpers_1 = require("tnp-helpers");
-var HelpersSwagger = /** @class */ (function (_super) {
-    tslib_1.__extends(HelpersSwagger, _super);
-    function HelpersSwagger() {
-        return _super !== null && _super.apply(this, arguments) || this;
-    }
-    HelpersSwagger.preparePaths = function (apis, outputBase) {
-        this.output = "".concat(process.cwd(), "/").concat(outputBase);
-        this.apis = apis;
+const tnp_core_1 = require("tnp-core");
+const tnp_core_2 = require("tnp-core");
+const tnp_helpers_1 = require("tnp-helpers");
+class HelpersSwagger extends tnp_core_2.CoreHelpers {
+    static SYMBOL = {
+        INDEX_SWG: Symbol(),
+        OUTPUT_FOLDER: Symbol()
     };
-    HelpersSwagger.prepareModel = function (swg, indexSwg, isHttpsEnable) {
+    static output;
+    static apis;
+    static preparePaths(apis, outputBase) {
+        this.output = `${process.cwd()}/${outputBase}`;
+        this.apis = apis;
+    }
+    static prepareModel(swg, indexSwg, isHttpsEnable) {
         swg[this.SYMBOL.INDEX_SWG] = indexSwg;
-        swg.host = swg.host && (isHttpsEnable ? 'https' : 'http') + "://".concat(swg.host.replace(/:[0-9]*/g, ''));
+        swg.host = swg.host && (isHttpsEnable ? 'https' : 'http') + `://${swg.host.replace(/:[0-9]*/g, '')}`;
         if (!swg.basePath) {
             swg.basePath = '';
         }
-    };
+    }
     //#region @backend
-    HelpersSwagger.recreateIfNotExist = function (pathToFileOrFolder, content) {
+    static recreateIfNotExist(pathToFileOrFolder, content) {
         if (tnp_core_1._.isUndefined(content)) {
             if (tnp_core_1.fse.existsSync(pathToFileOrFolder)) {
                 tnp_helpers_1.Helpers.remove(pathToFileOrFolder);
@@ -33,7 +34,7 @@ var HelpersSwagger = /** @class */ (function (_super) {
             if (tnp_core_1.fse.existsSync(pathToFileOrFolder)) {
                 tnp_core_1.fse.unlinkSync(pathToFileOrFolder);
             }
-            var dirName = tnp_core_1.path.dirname(pathToFileOrFolder);
+            const dirName = tnp_core_1.path.dirname(pathToFileOrFolder);
             if (!tnp_core_1.fse.existsSync(dirName)) {
                 tnp_core_1.fse.mkdirpSync(dirName);
             }
@@ -41,116 +42,96 @@ var HelpersSwagger = /** @class */ (function (_super) {
                 encoding: 'utf8'
             });
         }
-    };
-    Object.defineProperty(HelpersSwagger, "serviceFromTag", {
-        //#endregion
-        get: function () {
-            var self = this;
-            return {
-                allClassNames: function () {
-                    var names = [];
-                    self.apis.map(function (swg) {
-                        swg.tags.forEach(function (tag) {
-                            names.push(self.serviceFromTag.className(swg, tag));
-                        });
-                    });
-                    return names;
-                },
-                className: function (swg, tag) {
-                    var groupFolderName = self.groupFromJSON.folderName(swg);
-                    // console.log('groupFolderName', groupFolderName)
-                    var className = tnp_core_1._.upperFirst(tnp_core_1._.camelCase(tag.name)) + 'Service';
-                    return "".concat(groupFolderName).concat(className.replace(/\//g, ''));
-                },
-                absoluteFilePath: function (swg, tag) {
-                    return "".concat(self.absolutePath.PathFolder_services_groupName(swg), "/").concat(self.serviceFromTag.className(swg, tag), ".ts");
-                }
-            };
-        },
-        enumerable: false,
-        configurable: true
-    });
-    Object.defineProperty(HelpersSwagger, "endpoints", {
-        get: function () {
-            var _this = this;
-            return this.apis.map(function (swg) {
-                return "".concat(_this.groupFromJSON.folderName(swg), ":'").concat(swg.host, "'");
-            });
-        },
-        enumerable: false,
-        configurable: true
-    });
-    Object.defineProperty(HelpersSwagger, "absolutePath", {
-        get: function () {
-            var self = this;
-            return {
-                get output() {
-                    return self.output;
-                },
-                get PathFile_index_ts() {
-                    var APIpath = self.output;
-                    return "".concat(APIpath, "/index.ts");
-                },
-                get PathFile_module_ts() {
-                    var APIpath = self.output;
-                    return "".concat(APIpath, "/module.ts");
-                },
-                get PathFolder_services() {
-                    var APIpath = self.output;
-                    return "".concat(APIpath, "/services");
-                },
-                get PathFile_services_index_ts() {
-                    return "".concat(self.absolutePath.PathFolder_services, "/index.ts");
-                },
-                PathFolder_services_groupName: function (swg) {
-                    var groupFolderName = self.groupFromJSON.folderName(swg);
-                    // console.log('groupFolderName', groupFolderName)
-                    return "".concat(self.absolutePath.PathFolder_services, "/").concat(groupFolderName);
-                },
-                PathFile_services_groupName_index_ts: function (swg) {
-                    return "".concat(self.absolutePath.PathFolder_services_groupName(swg), "/index.ts");
-                },
-                PathFile_services_groupNAme_serviceName_ts: function (swg, tag) {
-                    var serviceFileName = self.serviceFromTag.className(swg, tag);
-                    return "".concat(self.absolutePath.PathFolder_services_groupName(swg), "/").concat(serviceFileName, ".ts");
-                }
-            };
-        },
-        enumerable: false,
-        configurable: true
-    });
-    Object.defineProperty(HelpersSwagger, "groupFromJSON", {
-        get: function () {
-            var self = this;
-            return {
-                get allGroupNames() {
-                    var names = [];
-                    self.apis.map(function (swg) {
-                        names.push(self.groupFromJSON.folderName(swg));
+    }
+    //#endregion
+    static get serviceFromTag() {
+        const self = this;
+        return {
+            allClassNames() {
+                const names = [];
+                self.apis.map(swg => {
+                    swg.tags.forEach(tag => {
+                        names.push(self.serviceFromTag.className(swg, tag));
                     });
-                    return names;
-                },
-                folderName: function (swg) {
-                    var basePath = swg.basePath;
-                    var index = swg[self.SYMBOL.INDEX_SWG];
-                    return tnp_core_1._.upperFirst(tnp_core_1._.camelCase(basePath.trim() === '' ? "json".concat(index) : basePath));
-                }
-            };
-        },
-        enumerable: false,
-        configurable: true
-    });
-    HelpersSwagger.findTags = function (swg) {
-        var tags = [];
-        Object.keys(swg.paths).forEach(function (p) {
-            Object.keys(swg.paths[p]).forEach(function (m) {
-                var a = swg.paths[p][m];
+                });
+                return names;
+            },
+            className(swg, tag) {
+                const groupFolderName = self.groupFromJSON.folderName(swg);
+                // console.log('groupFolderName', groupFolderName)
+                const className = tnp_core_1._.upperFirst(tnp_core_1._.camelCase(tag.name)) + 'Service';
+                return `${groupFolderName}${className.replace(/\//g, '')}`;
+            },
+            absoluteFilePath(swg, tag) {
+                return `${self.absolutePath.PathFolder_services_groupName(swg)}/${self.serviceFromTag.className(swg, tag)}.ts`;
+            }
+        };
+    }
+    static get endpoints() {
+        return this.apis.map(swg => {
+            return `${this.groupFromJSON.folderName(swg)}:'${swg.host}'`;
+        });
+    }
+    static get absolutePath() {
+        const self = this;
+        return {
+            get output() {
+                return self.output;
+            },
+            get PathFile_index_ts() {
+                const APIpath = self.output;
+                return `${APIpath}/index.ts`;
+            },
+            get PathFile_module_ts() {
+                const APIpath = self.output;
+                return `${APIpath}/module.ts`;
+            },
+            get PathFolder_services() {
+                const APIpath = self.output;
+                return `${APIpath}/services`;
+            },
+            get PathFile_services_index_ts() {
+                return `${self.absolutePath.PathFolder_services}/index.ts`;
+            },
+            PathFolder_services_groupName(swg) {
+                const groupFolderName = self.groupFromJSON.folderName(swg);
+                // console.log('groupFolderName', groupFolderName)
+                return `${self.absolutePath.PathFolder_services}/${groupFolderName}`;
+            },
+            PathFile_services_groupName_index_ts(swg) {
+                return `${self.absolutePath.PathFolder_services_groupName(swg)}/index.ts`;
+            },
+            PathFile_services_groupNAme_serviceName_ts(swg, tag) {
+                const serviceFileName = self.serviceFromTag.className(swg, tag);
+                return `${self.absolutePath.PathFolder_services_groupName(swg)}/${serviceFileName}.ts`;
+            }
+        };
+    }
+    static get groupFromJSON() {
+        const self = this;
+        return {
+            get allGroupNames() {
+                const names = [];
+                self.apis.map(swg => {
+                    names.push(self.groupFromJSON.folderName(swg));
+                });
+                return names;
+            },
+            folderName(swg) {
+                const basePath = swg.basePath;
+                const index = swg[self.SYMBOL.INDEX_SWG];
+                return tnp_core_1._.upperFirst(tnp_core_1._.camelCase(basePath.trim() === '' ? `json${index}` : basePath));
+            }
+        };
+    }
+    static findTags(swg) {
+        const tags = [];
+        Object.keys(swg.paths).forEach(p => {
+            Object.keys(swg.paths[p]).forEach(m => {
+                const a = swg.paths[p][m];
                 if (tnp_core_1._.isArray(a.tags)) {
-                    a.tags.forEach(function (tag) {
-                        if (tags.filter(function (_a) {
-                            var name = _a.name;
-                            return name === tag;
-                        }).length === 0) { // @ts-ignore
+                    a.tags.forEach(tag => {
+                        if (tags.filter(({ name }) => name === tag).length === 0) { // @ts-ignore
                             tags.push({ name: tag });
                         }
                     });
@@ -158,65 +139,62 @@ var HelpersSwagger = /** @class */ (function (_super) {
             });
         });
         return tags;
-    };
+    }
     /**
      * To generate get/books/{id} => get_books__id_
      */
-    HelpersSwagger.cleanPath = function (path) {
+    static cleanPath(path) {
         return path.replace(/{/g, "_").replace(/}/g, "_").replace(/\//g, "_").replace(/-/g, "_");
-    };
-    HelpersSwagger.cleanPathModel = function (pathModel) {
+    }
+    static cleanPathModel(pathModel) {
         return pathModel.replace(/\/{/g, '/:').replace(/}/g, '');
-    };
-    HelpersSwagger.swaggerTypeToJS = function (type, itemsType) {
-        if (itemsType === void 0) { itemsType = 'any'; }
+    }
+    static swaggerTypeToJS(type, itemsType = 'any') {
         return (type === 'integer') ? 'number'
-            : (type === 'array') ? !itemsType ? 'any' : "".concat(this.swaggerTypeToJS(itemsType), "[]")
+            : (type === 'array') ? !itemsType ? 'any' : `${this.swaggerTypeToJS(itemsType)}[]`
                 : (type === 'file') ? 'any' : type;
-    };
-    HelpersSwagger.getObjectDefinition = function (ref, swg, deep) {
-        var _this = this;
-        if (deep === void 0) { deep = 0; }
+    }
+    static getObjectDefinition(ref, swg, deep = 0) {
         if (deep == 1)
             return '';
         if (!ref) {
             console.log('Bad json $ref inside swagger');
             return '';
         }
-        var res = '';
+        let res = '';
         ref = ref.replace('#/', '').replace(/\//g, '.');
-        var obj = tnp_core_1._.get(swg, ref);
+        let obj = tnp_core_1._.get(swg, ref);
         // if (obj.properties.viaAgentViaGroupDTOs && !getObjectDefinition.prototype.once) {
         //     console.log('============================================================')
         //     console.log('obj', obj)
         //     console.log('------------------------------------------------------------')
         //     getObjectDefinition.prototype.once = true;
-        tnp_core_1._.forOwn(obj.properties, function (v, k) {
+        tnp_core_1._.forOwn(obj.properties, (v, k) => {
             // console.log(obj)
             if (v.$ref && typeof v.$ref === "string") {
-                res += k + ":{" + _this.getObjectDefinition(v.$ref, swg, deep++) + "};\n";
+                res += k + ":{" + this.getObjectDefinition(v.$ref, swg, deep++) + "};\n";
             }
             else if (v.schema && v.schema.$ref && typeof v.schema.$ref === "string") {
-                res += k + ":{" + _this.getObjectDefinition(v.schema.$ref, swg, deep++) + "};\n";
+                res += k + ":{" + this.getObjectDefinition(v.schema.$ref, swg, deep++) + "};\n";
             }
             else if (v.items && v.items.$ref && typeof v.items.$ref === "string" && v.type && v.type === 'array') {
-                res += k + ":{" + _this.getObjectDefinition(v.items.$ref, swg, deep++) + "}[];\n";
+                res += k + ":{" + this.getObjectDefinition(v.items.$ref, swg, deep++) + "}[];\n";
                 // console.log('make love here')
             }
             else if (v.items && v.items.$ref && typeof v.items.$ref === "string") {
-                res += k + ":{" + _this.getObjectDefinition(v.items.$ref, swg, deep++) + "};\n";
+                res += k + ":{" + this.getObjectDefinition(v.items.$ref, swg, deep++) + "};\n";
             }
             else {
-                var isRequired = (obj.required && obj.required instanceof Array && obj.required.filter(function (o) { return o === k; }).length > 0);
-                var type = (v.enum && v.enum instanceof Array && v.enum.length > 0)
-                    ? v.enum.map(function (e) { return '"' + e + '"'; }).join('|') : _this.swaggerTypeToJS(v.type, v.items ? v.items.type : 'any');
+                let isRequired = (obj.required && obj.required instanceof Array && obj.required.filter(o => o === k).length > 0);
+                let type = (v.enum && v.enum instanceof Array && v.enum.length > 0)
+                    ? v.enum.map(e => '"' + e + '"').join('|') : this.swaggerTypeToJS(v.type, v.items ? v.items.type : 'any');
                 res += k + (!isRequired ? '?' : "") + ":" + type + ";\n";
             }
         });
         //     console.log('res', res)
         // }
         return res;
-    };
+    }
     /**
      * private pathes = {
      *      get_all_companies: new SimpleResource<
@@ -225,21 +203,20 @@ var HelpersSwagger = /** @class */ (function (_super) {
      *          string, A, TA, RP extends Object, QP extends Rest.UrlParams>(endpoint, model)
      * }
      */
-    HelpersSwagger.getAngularPrivatePathesByTag = function (swg, tag) {
-        var _this = this;
-        var res = [];
-        var base = swg.basePath.replace('/', '');
-        var pathes = {};
-        tnp_core_1._.forOwn(swg.paths, function (v, k) {
-            tnp_core_1._.forOwn(v, function (v2, k2) {
-                if (tnp_core_1._.isArray(v2.tags) && v2.tags.filter(function (f) { return f === tag.name; }).length > 0) {
-                    var resp = v2.responses['200'] && v2.responses['200'].schema;
+    static getAngularPrivatePathesByTag(swg, tag) {
+        let res = [];
+        let base = swg.basePath.replace('/', '');
+        let pathes = {};
+        tnp_core_1._.forOwn(swg.paths, (v, k) => {
+            tnp_core_1._.forOwn(v, (v2, k2) => {
+                if (tnp_core_1._.isArray(v2.tags) && v2.tags.filter(f => f === tag.name).length > 0) {
+                    let resp = v2.responses['200'] && v2.responses['200'].schema;
                     // if (resp) {
                     // TODO response handling
                     // console.log('resp',resp);
                     if (pathes[k] === void 0)
                         pathes[k] = {}; // @ts-ignore
-                    var type = _this.getResponseType(resp, swg);
+                    let type = this.getResponseType(resp, swg);
                     if (type.length > 3 && type.charAt(type.length - 1) === ']' && type.charAt(type.length - 2) === '['
                         && !pathes[k]['array']) {
                         pathes[k]['array'] = type;
@@ -251,12 +228,12 @@ var HelpersSwagger = /** @class */ (function (_super) {
                 }
             });
         });
-        var pathResources = [];
-        tnp_core_1._.forOwn(pathes, function (v, p) {
+        let pathResources = [];
+        tnp_core_1._.forOwn(pathes, (v, p) => {
             // console.log(`${p} - ${JSON.stringify(v)}`);
             pathResources.push({
-                clean_path: _this.cleanPath(p),
-                model: _this.cleanPathModel(p),
+                clean_path: this.cleanPath(p),
+                model: this.cleanPathModel(p),
                 endpoint: swg.basePath,
                 singleModelType: !v['single'] ? 'any' : v['single'],
                 multipleModelType: !v['array'] ? 'any' : v['array'],
@@ -264,11 +241,11 @@ var HelpersSwagger = /** @class */ (function (_super) {
                 pathParamsType: 'any'
             });
         });
-        pathResources.forEach(function (p) {
-            res.push("".concat(p.clean_path, ": new SimpleResource<\n").concat(p.singleModelType, ",\n").concat(p.multipleModelType, "\n>( Ng2RestGenModule.enpointUrls.").concat(_this.groupFromJSON.folderName(swg), ", '").concat(p.model, "' )"));
+        pathResources.forEach(p => {
+            res.push(`${p.clean_path}: new SimpleResource<\n${p.singleModelType},\n${p.multipleModelType}\n>( Ng2RestGenModule.enpointUrls.${this.groupFromJSON.folderName(swg)}, '${p.model}' )`);
         });
-        return "private pathes = { \n".concat(res.join(',\n'), "\n};");
-    };
+        return `private pathes = { \n${res.join(',\n')}\n};`;
+    }
     /*
      schema": {
         "type": "array",
@@ -281,8 +258,8 @@ var HelpersSwagger = /** @class */ (function (_super) {
         "$ref": "#/definitions/CompanyDTO"
     }
      */
-    HelpersSwagger.getResponseType = function (o, swg) {
-        var res = '{} | any';
+    static getResponseType(o, swg) {
+        let res = '{} | any';
         if (o && o.$ref && typeof o.$ref === 'string' && o.$ref.trim() !== '') {
             res = "{" + this.getObjectDefinition(o.$ref, swg) + "}";
             // console.log('I am object', o.$ref)
@@ -296,104 +273,98 @@ var HelpersSwagger = /** @class */ (function (_super) {
         // console.log('type', res)
         // console.log('------------------------------------------------------------')
         return res;
-    };
+    }
     //#region @backend
     /**
    * public getAllCompanies =  ({ params },{ queryparams1 }) => this.pathes.get_all_companies.model(params).get(queryparams),
    * public getAllCompanies =  ({ params },{ queryparams1 },{body}) => this.pathes.get_all_companies.model(params).put(body,queryparams)
    */
-    HelpersSwagger.getServicesMethod = function (swg, tag) {
-        var _this = this;
-        var methods = [];
-        for (var urlpath in swg.paths) {
-            var _loop_1 = function (methodhttp) {
-                var m = swg.paths[urlpath][methodhttp];
-                if (tnp_core_1._.isArray(m.tags) && m.tags.filter(function (t) { return t === tag.name; }).length === 1) {
-                    var sm_1 = {};
-                    sm_1.summary = tnp_core_1._.camelCase(m.operationId ? m.operationId : m.summary);
-                    sm_1.method = methodhttp; // <Models.Morphi.Rest.HttpMethod>methodhttp;
-                    sm_1.path_cleand = this_1.cleanPath(urlpath);
+    static getServicesMethod(swg, tag) {
+        let methods = [];
+        for (let urlpath in swg.paths) {
+            for (let methodhttp in swg.paths[urlpath]) {
+                let m = swg.paths[urlpath][methodhttp];
+                if (tnp_core_1._.isArray(m.tags) && m.tags.filter(t => t === tag.name).length === 1) {
+                    let sm = {};
+                    sm.summary = tnp_core_1._.camelCase(m.operationId ? m.operationId : m.summary);
+                    sm.method = methodhttp; // <Models.Morphi.Rest.HttpMethod>methodhttp;
+                    sm.path_cleand = this.cleanPath(urlpath);
                     // console.log('sm.path_cleand', sm.path_cleand)
-                    sm_1.params = {};
-                    sm_1.params.query = [];
-                    sm_1.params.path = [];
-                    sm_1.params.body = [];
-                    sm_1.comment = '';
+                    sm.params = {};
+                    sm.params.query = [];
+                    sm.params.path = [];
+                    sm.params.body = [];
+                    sm.comment = '';
                     // QUICKFIX
                     if (m.responses && m.responses['200'] && m.responses['200'].schema // @ts-ignore
                         && m.responses['200'].schema.type && m.responses['200'].schema.type === 'array') {
-                        sm_1.isArray = true;
+                        sm.isArray = true;
                     }
                     if (m.parameters)
-                        m.parameters.forEach(function (param) {
-                            var ptypeExitst = (param.type && param.type.length > 0);
-                            sm_1.comment += ('*' + (ptypeExitst ? " { ".concat(param.type, " } ") : ' ') + "".concat(param.name, " (").concat(param.description, ")") + "\n");
+                        m.parameters.forEach(param => {
+                            let ptypeExitst = (param.type && param.type.length > 0);
+                            sm.comment += ('*' + (ptypeExitst ? ` { ${param.type} } ` : ' ') + `${param.name} (${param.description})` + "\n");
                             if (param.in === 'body') {
-                                var type = void 0;
+                                let type;
                                 if (param.schema.items && param.schema.items.$ref && param.schema.type == 'array') {
-                                    type = "{" + _this.getObjectDefinition(param.schema.items.$ref, swg) + "}[]";
+                                    type = "{" + this.getObjectDefinition(param.schema.items.$ref, swg) + "}[]";
                                 }
                                 else {
-                                    type = (param.schema.$ref ? ("{" + _this.getObjectDefinition(param.schema.$ref, swg) + "}")
-                                        : _this.swaggerTypeToJS(param.type));
+                                    type = (param.schema.$ref ? ("{" + this.getObjectDefinition(param.schema.$ref, swg) + "}")
+                                        : this.swaggerTypeToJS(param.type));
                                 }
                                 // @ts-ignore
-                                sm_1.params.body.push({
+                                sm.params.body.push({
                                     name: param.name,
-                                    type: type,
+                                    type,
                                     required: param.required,
                                     isObject: true
                                 });
                             }
                             else {
-                                if (!tnp_core_1._.isArray(sm_1.params[param.in])) {
-                                    sm_1.params[param.in] = [];
+                                if (!tnp_core_1._.isArray(sm.params[param.in])) {
+                                    sm.params[param.in] = [];
                                 }
-                                sm_1.params[param.in].push({
+                                sm.params[param.in].push({
                                     name: param.name,
-                                    type: _this.swaggerTypeToJS(param.type),
+                                    type: this.swaggerTypeToJS(param.type),
                                     required: param.required
                                 });
                             }
                         });
-                    methods.push(sm_1);
+                    methods.push(sm);
                 }
-            };
-            var this_1 = this;
-            for (var methodhttp in swg.paths[urlpath]) {
-                _loop_1(methodhttp);
             }
         }
         return methods;
-    };
+    }
     //#endregion
     //#region @backend
-    HelpersSwagger.getAngularServicesMethods = function (swg, tag) {
-        var _this = this;
-        var res = '';
-        var methods = this.getServicesMethod(swg, tag);
-        methods.forEach(function (m) {
-            var neededParams = {
+    static getAngularServicesMethods(swg, tag) {
+        let res = '';
+        let methods = this.getServicesMethod(swg, tag);
+        methods.forEach(m => {
+            let neededParams = {
                 path: (m.params && m.params.path && m.params.path.length > 0),
                 query: (m.params && m.params.query && m.params.query.length > 0),
                 body: (m.params && m.params.body && m.params.body.length > 0)
             };
-            var paramsPath = neededParams.path // @ts-ignore
-                ? m.params.path.map(function (p) { return p['joined'] = p.name + ':' + p.type; }).join(',') : '';
-            var paramsQuery = neededParams.query // @ts-ignore
-                ? m.params.query.map(function (p) { return p['joined'] = p.name + ':' + p.type; }).join(',') : '';
-            var paramsBody = neededParams.body // @ts-ignore
-                ? m.params.body.map(function (p) { return p['joined'] = p.name + ':' + p.type; }).join(',') : '';
-            var paramPathNames = "{" + (neededParams.path // @ts-ignore
-                ? m.params.path.map(function (p) { return p['joined'] = p.name; }).filter(function (d) { return d; }).join(',') : '') + '}';
-            var paramQueryNames = "{" + (neededParams.query // @ts-ignore
-                ? m.params.query.map(function (p) { return p['joined'] = p.name; }).filter(function (d) { return d; }).join(',') : '') + '}';
-            var paramBodyNames = "{" + (neededParams.body // @ts-ignore
-                ? m.params.body.map(function (p) { return p['joined'] = p.name; }).filter(function (d) { return d; }).join(',') : '') + '}';
-            var method = m.method;
+            let paramsPath = neededParams.path // @ts-ignore
+                ? m.params.path.map(p => p['joined'] = p.name + ':' + p.type).join(',') : '';
+            let paramsQuery = neededParams.query // @ts-ignore
+                ? m.params.query.map(p => p['joined'] = p.name + ':' + p.type).join(',') : '';
+            let paramsBody = neededParams.body // @ts-ignore
+                ? m.params.body.map(p => p['joined'] = p.name + ':' + p.type).join(',') : '';
+            let paramPathNames = "{" + (neededParams.path // @ts-ignore
+                ? m.params.path.map(p => p['joined'] = p.name).filter(d => d).join(',') : '') + '}';
+            let paramQueryNames = "{" + (neededParams.query // @ts-ignore
+                ? m.params.query.map(p => p['joined'] = p.name).filter(d => d).join(',') : '') + '}';
+            let paramBodyNames = "{" + (neededParams.body // @ts-ignore
+                ? m.params.body.map(p => p['joined'] = p.name).filter(d => d).join(',') : '') + '}';
+            let method = m.method;
             if (m.isArray && m.method === 'get')
                 method = 'query';
-            var params = [paramsPath, paramsQuery, paramsBody].filter(function (d) { return d && d !== '{}'; }).join(',');
+            let params = [paramsPath, paramsQuery, paramsBody].filter(d => d && d !== '{}').join(',');
             // QUICKFIX change {object} to object in method
             // @ts-ignore
             if (neededParams.query && m.params.query.length === 1 && m.params.query[0].isObject) { // @ts-ignore
@@ -403,27 +374,24 @@ var HelpersSwagger = /** @class */ (function (_super) {
             if (neededParams.body && m.params.body.length === 1 && m.params.body[0].isObject) { // @ts-ignore
                 paramBodyNames = paramBodyNames.match(new RegExp('[a-zA-Z]+', 'g'))[0];
             }
-            var paramsName = [paramBodyNames, paramQueryNames].filter(function (d) { return d && d !== '{}'; }).map(function (d) { return '<any>' + d; }).join(',');
-            var comment = m.comment ? ("/**" + '\n' +
-                "".concat(m.comment.trim(), "\n        */")) : '';
-            res += ("".concat(comment, "\npublic") + _this.recreateSummary(m.summary) + '= (' + params + ') =>\nthis.pathes.'
-                + m.path_cleand + "\n.model(".concat(paramPathNames, ") \n.").concat(method, " (").concat(paramsName, "); ") + "\n");
+            let paramsName = [paramBodyNames, paramQueryNames].filter(d => d && d !== '{}').map(d => '<any>' + d).join(',');
+            let comment = m.comment ? (`/**` + '\n' +
+                `${m.comment.trim()}
+        */`) : '';
+            res += (`${comment}
+public` + this.recreateSummary(m.summary) + '= (' + params + ') =>\nthis.pathes.'
+                + m.path_cleand + `\n.model(${paramPathNames}) \n.${method} (${paramsName}); ` + "\n");
         });
         return res;
-    };
-    HelpersSwagger.recreateSummary = function (summary) {
+    }
+    //#endregion
+    static count1 = 0;
+    static recreateSummary(summary) {
         // if (!summary) {
         //   return 'SummaryExample' + (count1++)
         // }
         return summary;
-    };
-    HelpersSwagger.SYMBOL = {
-        INDEX_SWG: Symbol(),
-        OUTPUT_FOLDER: Symbol()
-    };
-    //#endregion
-    HelpersSwagger.count1 = 0;
-    return HelpersSwagger;
-}(tnp_core_2.CoreHelpers));
+    }
+}
 exports.HelpersSwagger = HelpersSwagger;
 //# sourceMappingURL=helpers.js.map