openapi-ts-generator 3.11.6 → 3.26.5

package/README.md

@@ -1,4 +1,4 @@
-[![Build Status](https://ikemtz.visualstudio.com/CI%20CD/_apis/build/status/openapi-ts-generator?branchName=master)](https://ikemtz.visualstudio.com/CI%20CD/_build/latest?definitionId=20&branchName=master) [![npm version](https://badge.fury.io/js/openapi-ts-generator.svg)](https://www.npmjs.com/package/openapi-ts-generator) [![npm downloads](https://img.shields.io/npm/dt/openapi-ts-generator)](https://www.npmjs.com/package/openapi-ts-generator) [![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=open-api-ts-generator&metric=alert_status)](https://sonarcloud.io/dashboard?id=open-api-ts-generator) [![Issues](https://img.shields.io/github/issues-raw/ikemtz/OpenApi-TS-Generator)](https://github.com/ikemtz/openapi-ts-generator/issues) [![Coverage](https://sonarcloud.io/api/project_badges/measure?project=open-api-ts-generator&metric=coverage)](https://sonarcloud.io/dashboard?id=open-api-ts-generator) [![Lines of Code](https://sonarcloud.io/api/project_badges/measure?project=open-api-ts-generator&metric=ncloc)](https://sonarcloud.io/dashboard?id=open-api-ts-generator) [![Security Rating](https://sonarcloud.io/api/project_badges/measure?project=open-api-ts-generator&metric=security_rating)](https://sonarcloud.io/dashboard?id=open-api-ts-generator)
+[![Build Status](https://ikemtz.visualstudio.com/CI%20CD/_apis/build/status/openapi-ts-generator?branchName=master)](https://ikemtz.visualstudio.com/CI%20CD/_build/latest?definitionId=20&branchName=master) [![npm version](https://badge.fury.io/js/openapi-ts-generator.svg)](https://www.npmjs.com/package/openapi-ts-generator) [![npm downloads](https://img.shields.io/npm/dt/openapi-ts-generator)](https://www.npmjs.com/package/openapi-ts-generator) [![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=ikemtz_openapi-ts-generator&metric=alert_status)](https://sonarcloud.io/dashboard?id=ikemtz_openapi-ts-generator) [![Issues](https://img.shields.io/github/issues-raw/ikemtz/OpenApi-TS-Generator)](https://github.com/ikemtz/openapi-ts-generator/issues) [![Coverage](https://sonarcloud.io/api/project_badges/measure?project=ikemtz_openapi-ts-generator&metric=coverage)](https://sonarcloud.io/dashboard?id=ikemtz_openapi-ts-generator) [![Lines of Code](https://sonarcloud.io/api/project_badges/measure?project=ikemtz_openapi-ts-generator&metric=ncloc)](https://sonarcloud.io/dashboard?id=ikemtz_openapi-ts-generator) [![Security Rating](https://sonarcloud.io/api/project_badges/measure?project=ikemtz_openapi-ts-generator&metric=security_rating)](https://sonarcloud.io/dashboard?id=ikemtz_openapi-ts-generator)
 
 # OpenApi-TS-Generator
 
@@ -34,6 +34,7 @@ const generator = require('openapi-ts-generator');
 generator.generateTsModels({
   openApiJsonUrl: '{Your Swagger Enpoint URL here}',
   outputPath: './{outputFolder}/',
+  genAngularFormGroups: true /* Set this to true if only if you're in an Angular project*/
 });
 ```
 
@@ -48,6 +49,18 @@ generator.generateTsModels({
 });
 ```
 
+## Want to include Angular FormGroup Factories?
+
+```javascript
+const generator = require('openapi-ts-generator');
+
+generator.generateTsModels({
+  openApiJsonFileName: '{location and file name of your OpenApi document}',
+  outputPath: './{outputFolder}/',
+  genAngularFormGroups: true
+});
+```
+
 ## Working example with NRSRx based service
 
 ```javascript

package/generators/barrel-generator.d.ts

@@ -1,5 +1,4 @@
 import { IGeneratorOptions } from '../models/generator-options';
-import { ITemplateData } from '../models/template-data';
 import { BaseGenerator } from './base-generator';
 export declare class BarrelGenerator extends BaseGenerator<{
     fileNames: string[];
@@ -7,5 +6,5 @@ export declare class BarrelGenerator extends BaseGenerator<{
     readonly GeneratorName = "BarrelGenerator";
     private readonly tsRegex;
     constructor(options: IGeneratorOptions);
-    generate(templateData: ITemplateData): string | null;
+    generate(): string | null;
 }

package/generators/barrel-generator.js

@@ -3,10 +3,12 @@ var __extends = (this && this.__extends) || (function () {
     var extendStatics = function (d, b) {
         extendStatics = Object.setPrototypeOf ||
             ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
-            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+            function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null)
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
@@ -25,10 +27,10 @@ var BarrelGenerator = /** @class */ (function (_super) {
         _this.tsRegex = /.ts$/;
         return _this;
     }
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    BarrelGenerator.prototype.generate = function (templateData) {
+    BarrelGenerator.prototype.generate = function () {
         var _this = this;
         var fileNames = fs_1.readdirSync(this.generatorOptions.outputPath).map(function (value) { return value.replace(_this.tsRegex, ''); });
+        fileNames = fileNames.filter(function (x) { return x !== 'endpoints'; });
         return _super.prototype.generateFile.call(this, this.generatorOptions.outputPath + "/index.ts", { fileNames: fileNames });
     };
     return BarrelGenerator;

package/generators/base-generator.js

@@ -14,7 +14,7 @@ var BaseGenerator = /** @class */ (function () {
         }
     }
     BaseGenerator.prototype.generateFile = function (outputFilePath, context) {
-        var _a, _b, _c, _d, _e, _f;
+        var _a, _b, _c, _d, _e, _f, _g;
         if (this.template) {
             try {
                 var content = this.template(context).replace(this.emptyArrayRegex, ']');
@@ -22,16 +22,16 @@ var BaseGenerator = /** @class */ (function () {
                 return content;
             }
             catch (err) {
-                (_a = this.generatorOptions.logger) === null || _a === void 0 ? void 0 : _a.error("Error executing template: " + this.templateFilePath + ".");
-                (_b = this.generatorOptions.logger) === null || _b === void 0 ? void 0 : _b.error("This is likely an issue with the template.");
-                (_c = this.generatorOptions.logger) === null || _c === void 0 ? void 0 : _c.error("Data: " + JSON.stringify(context));
-                (_d = this.generatorOptions.logger) === null || _d === void 0 ? void 0 : _d.error("Goto: https://github.com/ikemtz/openapi-ts-generator to report an issue if necessary.");
-                (_e = this.generatorOptions.logger) === null || _e === void 0 ? void 0 : _e.error(err);
+                (_a = this.generatorOptions.logger) === null || _a === void 0 ? void 0 : _a.error("Error executing template: " + ((_b = this.templateFilePath) !== null && _b !== void 0 ? _b : 'undefined') + ".");
+                (_c = this.generatorOptions.logger) === null || _c === void 0 ? void 0 : _c.error("This is likely an issue with the template.");
+                (_d = this.generatorOptions.logger) === null || _d === void 0 ? void 0 : _d.error("Data: " + JSON.stringify(context));
+                (_e = this.generatorOptions.logger) === null || _e === void 0 ? void 0 : _e.error("Goto: https://github.com/ikemtz/openapi-ts-generator to report an issue if necessary.");
+                (_f = this.generatorOptions.logger) === null || _f === void 0 ? void 0 : _f.error(err);
                 throw err;
             }
         }
         else {
-            (_f = this.generatorOptions.logger) === null || _f === void 0 ? void 0 : _f.warn("Template for " + this.GeneratorName + " has not been specified");
+            (_g = this.generatorOptions.logger) === null || _g === void 0 ? void 0 : _g.warn("Template for " + this.GeneratorName + " has not been specified");
         }
         return null;
     };

package/generators/endpoints-generator.d.ts

@@ -0,0 +1,12 @@
+import { IGeneratorOptions } from '../models/generator-options';
+import { IPath, ITemplateData } from '../models/template-data';
+import { BaseGenerator } from './base-generator';
+export declare class EndPointsGenerator extends BaseGenerator<{
+    paths: IPath[];
+}> {
+    readonly GeneratorName = "EndPointsGenerator";
+    readonly endpointIdentifierRegex: RegExp;
+    constructor(options: IGeneratorOptions);
+    generate(templateData: ITemplateData): string | null;
+    eliminateDupes(templateData: ITemplateData): IPath[];
+}

package/generators/endpoints-generator.js

@@ -0,0 +1,70 @@
+"use strict";
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    };
+    return function (d, b) {
+        if (typeof b !== "function" && b !== null)
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
+var __spreadArray = (this && this.__spreadArray) || function (to, from) {
+    for (var i = 0, il = from.length, j = to.length; i < il; i++, j++)
+        to[j] = from[i];
+    return to;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.EndPointsGenerator = void 0;
+var base_generator_1 = require("./base-generator");
+var _ = require("lodash");
+var EndPointsGenerator = /** @class */ (function (_super) {
+    __extends(EndPointsGenerator, _super);
+    function EndPointsGenerator(options) {
+        var _a;
+        var _this = _super.call(this, options, (_a = options.templates) === null || _a === void 0 ? void 0 : _a.endpoints) || this;
+        _this.GeneratorName = 'EndPointsGenerator';
+        _this.endpointIdentifierRegex = /[A-z0-9_-]*$/;
+        return _this;
+    }
+    EndPointsGenerator.prototype.generate = function (templateData) {
+        var paths = this.eliminateDupes(templateData);
+        return _super.prototype.generateFile.call(this, this.generatorOptions.outputPath + "/endpoints.ts", { paths: paths });
+    };
+    EndPointsGenerator.prototype.eliminateDupes = function (templateData) {
+        var _this = this;
+        var sortedTemplateData = __spreadArray([], templateData.paths).sort(function (x, y) { return (x.endpoint.toUpperCase() < y.endpoint.toUpperCase() ? -1 : 1); });
+        var result = [];
+        sortedTemplateData.forEach(function (val) {
+            val = __assign(__assign({}, val), { tag: _.camelCase(val.tag) });
+            var dupeIndex = result.findIndex(function (f) { return f.tag === val.tag; });
+            if (dupeIndex > -1) {
+                var dupeCount = result.filter(function (f) { return f.tag === val.tag; }).length + 1;
+                var endpointIdentifier = (_this.endpointIdentifierRegex.exec(val.endpoint) || [])[0];
+                result.push(__assign(__assign({}, val), { tag: _.camelCase(val.tag + "_" + (endpointIdentifier || dupeCount)) }));
+            }
+            else {
+                result.push(val);
+            }
+        });
+        return result;
+    };
+    return EndPointsGenerator;
+}(base_generator_1.BaseGenerator));
+exports.EndPointsGenerator = EndPointsGenerator;

package/generators/form-group-generator.js

@@ -3,10 +3,12 @@ var __extends = (this && this.__extends) || (function () {
     var extendStatics = function (d, b) {
         extendStatics = Object.setPrototypeOf ||
             ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
-            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+            function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null)
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());

package/generators/index.js

@@ -7,7 +7,7 @@ var __createBinding = (this && this.__createBinding) || (Object.create ? (functi
     o[k2] = m[k];
 }));
 var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !exports.hasOwnProperty(p)) __createBinding(exports, m, p);
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./model-generator"), exports);

package/generators/model-generator.js

@@ -3,10 +3,12 @@ var __extends = (this && this.__extends) || (function () {
     var extendStatics = function (d, b) {
         extendStatics = Object.setPrototypeOf ||
             ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
-            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+            function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null)
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());

package/generators/model-properties-generator.js

@@ -3,10 +3,12 @@ var __extends = (this && this.__extends) || (function () {
     var extendStatics = function (d, b) {
         extendStatics = Object.setPrototypeOf ||
             ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
-            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+            function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null)
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());

package/index.js

@@ -36,10 +36,10 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     }
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.generateTsModels = void 0;
+exports.generateTsModels = exports.nrsrxValuePropertyTypeFilterCallBack = exports.nrsrxTypeFilterCallBack = void 0;
 var fs = require("fs");
-var node_fetch_1 = require("node-fetch");
 var generators_1 = require("./generators");
+var endpoints_generator_1 = require("./generators/endpoints-generator");
 var generator_options_1 = require("./models/generator-options");
 var openapidoc_converter_1 = require("./openapidoc-converter");
 var nrsrx_filters_1 = require("./models/nrsrx-filters");
@@ -71,12 +71,12 @@ function getOpenApiDocumentAsync(options) {
             switch (_a.label) {
                 case 0:
                     if (!options.openApiJsonUrl) return [3 /*break*/, 3];
-                    return [4 /*yield*/, node_fetch_1.default(options.openApiJsonUrl)];
+                    return [4 /*yield*/, fetch(options.openApiJsonUrl)];
                 case 1:
                     response = _a.sent();
                     return [4 /*yield*/, response.json()];
                 case 2:
-                    apiDoc = _a.sent();
+                    apiDoc = (_a.sent());
                     return [3 /*break*/, 4];
                 case 3:
                     if (options.openApiJsonFileName) {
@@ -100,10 +100,14 @@ function generateOutput(options, templateData) {
     fs.mkdirSync(options.outputPath, { recursive: true });
     var modelGenerator = new generators_1.ModelGenerator(options);
     modelGenerator.generate(templateData);
-    var formGroupGenerator = new generators_1.FormGroupGenerator(options);
-    formGroupGenerator.generate(templateData);
+    if (options.genAngularFormGroups) {
+        var formGroupGenerator = new generators_1.FormGroupGenerator(options);
+        formGroupGenerator.generate(templateData);
+    }
     var modelPropertiesGenerator = new generators_1.ModelPropertiesGenerator(options);
     modelPropertiesGenerator.generate(templateData);
+    var endpointGenerator = new endpoints_generator_1.EndPointsGenerator(options);
+    endpointGenerator.generate(templateData);
     var barrelGenerator = new generators_1.BarrelGenerator(options);
-    barrelGenerator.generate(templateData);
+    barrelGenerator.generate();
 }

package/models/generator-options.d.ts

@@ -5,19 +5,20 @@ export interface IGeneratorOptions {
     outputPath: string;
     openApiJsonUrl?: string;
     openApiJsonFileName?: string;
-    messageFormat?: string | null;
-    angular?: boolean | null;
+    genAngularFormGroups?: boolean;
     typeFilterCallBack?: (entity: IEntity, index: number, array: IEntity[]) => boolean;
     valuePropertyTypeFilterCallBack?: (valueProperty: IValueProperty, index: number, array: IValueProperty[]) => boolean;
     referencePropertyTypeFilterCallBack?: (referenceProperty: IReferenceProperty, index: number, array: IReferenceProperty[]) => boolean;
+    pathUrlFormattingCallBack?: (url: string) => string;
     templates?: ITemplates | null;
 }
 export interface ITemplates {
-    model: string;
-    formGroupFactory: string;
-    modelProperties: string;
-    barrel: string;
-    enum: string;
+    model?: string;
+    formGroupFactory?: string;
+    modelProperties?: string;
+    barrel?: string;
+    enum?: string;
+    endpoints?: string;
 }
 export declare function defaultFilter(value: IEntity | IValueProperty | IReferenceProperty, index: number, array: IEntity[] | IValueProperty[] | IReferenceProperty[]): boolean;
 export declare function setGeneratorOptionDefaults(options: IGeneratorOptions): IGeneratorOptions;

package/models/generator-options.js

@@ -19,12 +19,12 @@ function defaultFilter(value, index, array) {
 }
 exports.defaultFilter = defaultFilter;
 function setGeneratorOptionDefaults(options) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q;
     var templateFolder = path_1.resolve(__dirname + "/..", 'templates');
     options.typeFilterCallBack = (_a = options.typeFilterCallBack) !== null && _a !== void 0 ? _a : defaultFilter;
     options.valuePropertyTypeFilterCallBack = (_b = options.valuePropertyTypeFilterCallBack) !== null && _b !== void 0 ? _b : defaultFilter;
     options.referencePropertyTypeFilterCallBack = (_c = options.referencePropertyTypeFilterCallBack) !== null && _c !== void 0 ? _c : defaultFilter;
-    options.templates = __assign(__assign({}, options.templates), { model: (_e = (_d = options.templates) === null || _d === void 0 ? void 0 : _d.model) !== null && _e !== void 0 ? _e : templateFolder + "/model.ts.hbs", formGroupFactory: (_g = (_f = options.templates) === null || _f === void 0 ? void 0 : _f.formGroupFactory) !== null && _g !== void 0 ? _g : templateFolder + "/form-group-factory.ts.hbs", barrel: (_j = (_h = options.templates) === null || _h === void 0 ? void 0 : _h.barrel) !== null && _j !== void 0 ? _j : templateFolder + "/index.ts.hbs", enum: (_l = (_k = options.templates) === null || _k === void 0 ? void 0 : _k.barrel) !== null && _l !== void 0 ? _l : templateFolder + "/enum.ts.hbs", modelProperties: (_o = (_m = options.templates) === null || _m === void 0 ? void 0 : _m.barrel) !== null && _o !== void 0 ? _o : templateFolder + "/model-properties.ts.hbs" });
+    options.templates = __assign(__assign({}, options.templates), { model: (_e = (_d = options.templates) === null || _d === void 0 ? void 0 : _d.model) !== null && _e !== void 0 ? _e : templateFolder + "/model.ts.hbs", formGroupFactory: (_g = (_f = options.templates) === null || _f === void 0 ? void 0 : _f.formGroupFactory) !== null && _g !== void 0 ? _g : templateFolder + "/form-group-factory.ts.hbs", barrel: (_j = (_h = options.templates) === null || _h === void 0 ? void 0 : _h.barrel) !== null && _j !== void 0 ? _j : templateFolder + "/index.ts.hbs", enum: (_l = (_k = options.templates) === null || _k === void 0 ? void 0 : _k.barrel) !== null && _l !== void 0 ? _l : templateFolder + "/enum.ts.hbs", modelProperties: (_o = (_m = options.templates) === null || _m === void 0 ? void 0 : _m.barrel) !== null && _o !== void 0 ? _o : templateFolder + "/model-properties.ts.hbs", endpoints: (_q = (_p = options.templates) === null || _p === void 0 ? void 0 : _p.endpoints) !== null && _q !== void 0 ? _q : templateFolder + "/endpoints.ts.hbs" });
     return options;
 }
 exports.setGeneratorOptionDefaults = setGeneratorOptionDefaults;

package/models/logger.js

@@ -1,6 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MockConsoleLogger = void 0;
+/* eslint-disable @typescript-eslint/no-unused-vars */
+/* eslint-disable @typescript-eslint/explicit-module-boundary-types */
+/* eslint-disable @typescript-eslint/no-empty-function */
 var MockConsoleLogger = /** @class */ (function () {
     function MockConsoleLogger() {
         this.log = function (data) { };

package/models/template-data.d.ts

@@ -1,6 +1,10 @@
 export interface ITemplateData {
     entities?: IEntity[];
-    paths: string[];
+    paths: IPath[];
+}
+export interface IPath {
+    tag: string;
+    endpoint: string;
 }
 export interface IEntity {
     name: string;

package/openapidoc-converter.d.ts

@@ -1,13 +1,14 @@
 import { OpenAPIObject } from 'openapi3-ts';
 import { IGeneratorOptions } from './models/generator-options';
 import { SchemaWrapperInfo } from './models/schema-info';
-import { IEntity, IImportType, IReferenceProperty, ITemplateData, IValueProperty } from './models/template-data';
+import { IEntity, IImportType, IPath, IReferenceProperty, ITemplateData, IValueProperty } from './models/template-data';
 export declare class OpenApiDocConverter {
     private readonly options;
     private readonly apiDocument;
     readonly regex: RegExp;
     constructor(options: IGeneratorOptions, apiDocument: OpenAPIObject);
     convertDocument(): ITemplateData;
+    convertPaths(): IPath[];
     convertEntities(): IEntity[];
     buildSchemaWrapperInfo(schemaWrapperInfo: SchemaWrapperInfo): void;
     convertArray(propertyName: string, schemaWrapperInfo: SchemaWrapperInfo): void;

package/openapidoc-converter.js

@@ -12,9 +12,9 @@ var __assign = (this && this.__assign) || function () {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.OpenApiDocConverter = void 0;
-var _ = require("lodash");
 var generator_options_1 = require("./models/generator-options");
 var schema_info_1 = require("./models/schema-info");
+var _ = require("lodash");
 var OpenApiDocConverter = /** @class */ (function () {
     function OpenApiDocConverter(options, apiDocument) {
         this.options = options;
@@ -23,9 +23,23 @@ var OpenApiDocConverter = /** @class */ (function () {
     }
     OpenApiDocConverter.prototype.convertDocument = function () {
         var entities = this.convertEntities();
-        var paths = [];
+        var paths = this.convertPaths();
         return { entities: entities, paths: paths };
     };
+    OpenApiDocConverter.prototype.convertPaths = function () {
+        var paths = [];
+        for (var key in this.apiDocument.paths) {
+            var path = this.apiDocument.paths[key] || {};
+            var tagLookup = path.get || path.post || path.put;
+            tagLookup = tagLookup || path.delete || path.patch;
+            var tag = ((tagLookup === null || tagLookup === void 0 ? void 0 : tagLookup.tags) || ['unknown_endpoint'])[0];
+            paths.push({
+                tag: _.snakeCase(tag),
+                endpoint: this.options.pathUrlFormattingCallBack ? this.options.pathUrlFormattingCallBack(key) : key,
+            });
+        }
+        return paths;
+    };
     OpenApiDocConverter.prototype.convertEntities = function () {
         var _a, _b, _c;
         var entities = [];
@@ -51,12 +65,14 @@ var OpenApiDocConverter = /** @class */ (function () {
                 schemaWrapperInfo.propertySchemaObject.type !== 'array') {
                 schemaWrapperInfo.valueProperties.push(this.convertSchemaObjectToPropertyType(propertyName, schemaWrapperInfo));
             }
-            else if ((schemaWrapperInfo.propertyReferenceObject = schemaWrapperInfo.componentSchemaObject.properties[propertyName])
-                .$ref) {
-                schemaWrapperInfo.referenceProperties.push(this.convertReferenceObjectToPropertyType(propertyName, schemaWrapperInfo));
-            }
-            else if (schemaWrapperInfo.propertySchemaObject.type === 'array' && schemaWrapperInfo.propertySchemaObject.items) {
-                this.convertArray(propertyName, schemaWrapperInfo);
+            else {
+                schemaWrapperInfo.propertyReferenceObject = schemaWrapperInfo.componentSchemaObject.properties[propertyName];
+                if (schemaWrapperInfo.propertyReferenceObject.$ref) {
+                    schemaWrapperInfo.referenceProperties.push(this.convertReferenceObjectToPropertyType(propertyName, schemaWrapperInfo));
+                }
+                else if (schemaWrapperInfo.propertySchemaObject.type === 'array' && schemaWrapperInfo.propertySchemaObject.items) {
+                    this.convertArray(propertyName, schemaWrapperInfo);
+                }
             }
         }
     };
@@ -110,6 +126,9 @@ var OpenApiDocConverter = /** @class */ (function () {
         if (schemaWrapperInfo.propertySchemaObject.type === 'array' && schemaWrapperInfo.propertySchemaObject.items) {
             return schemaWrapperInfo.propertySchemaObject.items.type;
         }
+        else if (schemaWrapperInfo.propertySchemaObject.type === 'integer' && schemaWrapperInfo.propertySchemaObject.enum) {
+            return 'string | number';
+        }
         else if (schemaWrapperInfo.propertySchemaObject.type === 'integer') {
             return 'number';
         }
@@ -117,7 +136,7 @@ var OpenApiDocConverter = /** @class */ (function () {
             return 'Date';
         }
         if (!schemaWrapperInfo.propertySchemaObject.type) {
-            throw new Error('Invalid Propety Type');
+            throw new Error('Invalid Property Type');
         }
         return schemaWrapperInfo.propertySchemaObject.type;
     };

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "openapi-ts-generator",
-  "version": "3.011.06",
-  "description": "Based on swagger-ts-generator, this is a type script model generator specifically for OData endpoints documented by swagger.",
+  "version": "3.26.5",
+  "description": "Based on swagger-ts-generator, this is a type script model generator specifically for services with OpenApi spec documentation.",
   "main": "index.js",
   "types": "index.d.ts",
   "scripts": {
     "build": "npm run format && npm run lint && tsc && cp -rfv ./src/templates ./lib",
-    "format": "prettier --write \"src/**/*.ts\" \"src/**/*.js\"",
-    "lint": "eslint . --ext .ts",
+    "format": "prettier --write \"src/**/*.ts\"",
+    "lint": "eslint . --ext .ts --output-file ./eslint-report.json --format json",
     "test": "npm run build && jest --collect-coverage",
     "prep:lib": "rm -rv ./lib/*.spec.* && rm -rv ./lib/**/*.spec.* && cp -v ./package.json ./lib/ && cp -v ./LICENSE ./lib/ && cp -v ./README.md ./lib/",
     "debug": "npm run build && node --inspect-brk ./lib/app.js"
@@ -24,7 +24,8 @@
     "TypeScript",
     "TS",
     "Interfaces",
-    "Angular"
+    "Angular",
+    "Swagger"
   ],
   "license": "MIT",
   "bugs": {
@@ -35,33 +36,31 @@
   ],
   "homepage": "https://github.com/ikemtz/OpenApi-TS-Generator#readme",
   "devDependencies": {
-    "@angular/forms": "^10.2.3",
-    "@types/jest": "^24.9.1",
-    "@types/lodash": "^4.14.165",
-    "@types/node": "^11.15.38",
-    "@types/node-fetch": "^2.5.7",
-    "@typescript-eslint/eslint-plugin": "^4.13.0",
-    "@typescript-eslint/parser": "^4.13.0",
-    "eslint": "^7.17.0",
-    "eslint-config-prettier": "^7.1.0",
-    "jest": "^26.6.3",
-    "jest-junit": "^9.0.0",
-    "openapi3-ts": "^1.4.0",
-    "prettier": "^1.19.1",
-    "rxjs": "^6.6.3",
-    "ts-jest": "^26.4.4",
-    "tslint": "^5.20.1",
-    "tslint-config-prettier": "^1.18.0",
-    "typescript": "^3.9.7"
+    "@types/jest": "^26.0.22",
+    "@types/lodash": "^4.14.168",
+    "@types/node": "^15.9.0",
+    "@typescript-eslint/eslint-plugin": "4.26",
+    "@typescript-eslint/parser": "4.26",
+    "eslint": "7.23",
+    "eslint-config-prettier": "^8.1.0",
+    "eslint-config-standard": "^16.0.2",
+    "eslint-plugin-import": "^2.23.4",
+    "eslint-plugin-node": "^11.1.0",
+    "eslint-plugin-promise": "^5.1.0",
+    "jest": "^27.0.3",
+    "jest-junit": "^12.1.0",
+    "openapi3-ts": "^2.0.1",
+    "prettier": "^2.2.1",
+    "rxjs": "^7.1.0",
+    "ts-jest": "^27.0.2",
+    "typescript": "^4.3.2"
   },
   "dependencies": {
-    "handlebars": "^4.7.6",
-    "lodash": "^4.17.20",
-    "node-fetch": "^2.6.1"
+    "handlebars": "^4.x",
+    "lodash": "^4.x"
   },
   "peerDependencies": {
     "handlebars": "^4.x",
-    "lodash": "^4.x",
-    "node-fetch": "^2.x"
+    "lodash": "^4.x"
   }
 }

package/templates/endpoints.ts.hbs

@@ -0,0 +1,17 @@
+/**
+ * This file is generated by the openapi-ts-generator
+ * #endpoints-ts.hbs
+ * For issues or feature request, visit the repo: https://github.com/ikemtz/openapi-ts-generator
+ * Do not edit.
+ */
+/* tslint:disable */
+export enum Endpoints {
+{{#paths}}
+  {{tag}} = '{{endpoint}}',
+{{/paths}}
+}
+export interface IEndpoints {
+{{#paths}}
+  readonly {{tag}}: string;
+{{/paths}}
+}

package/templates/model.ts.hbs

@@ -4,7 +4,7 @@
  * For issues or feature request, visit the repo: https://github.com/ikemtz/openapi-ts-generator
  * Do not edit.
  */
-/* tslint:disable */
+// eslint-disable-next-line @typescript-eslint/no-empty-interface
 {{#if importTypes}}
 {{#importTypes}}
 import { I{{name}} } from './{{kebabCasedTypeName}}.model';