- Added tests

Author: ferdikoomen

.eslintrc.json

@@ -10,14 +10,20 @@
         "node": true,
         "jest": true
     },
+    "plugins": [
+        "sort-imports-es6-autofix"
+    ],
     "rules": {
         "@typescript-eslint/no-explicit-any": 0,
         "@typescript-eslint/no-inferrable-types": 0,
         "@typescript-eslint/no-non-null-assertion": 0,
         "@typescript-eslint/ban-ts-ignore": 0,
         "@typescript-eslint/explicit-function-return-type": 0,
-        "prettier/prettier": [
-            "error"
-        ]
+        "sort-imports-es6-autofix/sort-imports-es6": [2, {
+            "ignoreCase": false,
+            "ignoreMemberSort": false,
+            "memberSyntaxSortOrder": ["none", "all", "multiple", "single"]
+        }],
+        "prettier/prettier": ["error"]
     }
 }

package.json

@@ -79,6 +79,7 @@
         "eslint": "6.6.0",
         "eslint-config-prettier": "6.7.0",
         "eslint-plugin-prettier": "3.1.1",
+        "eslint-plugin-sort-imports-es6-autofix": "0.5.0",
         "glob": "7.1.6",
         "handlebars": "4.5.3",
         "jest": "24.9.0",

src/index.ts

@@ -1,11 +1,11 @@
 import * as path from 'path';
+import * as ts from 'typescript';
+import { OpenApiVersion, getOpenApiVersion } from './utils/getOpenApiVersion';
+import { getOpenApiSpec } from './utils/getOpenApiSpec';
 import { parse as parseV2 } from './openApi/v2';
 import { parse as parseV3 } from './openApi/v3';
 import { readHandlebarsTemplates } from './utils/readHandlebarsTemplates';
-import { getOpenApiSpec } from './utils/getOpenApiSpec';
 import { writeClient } from './utils/writeClient';
-import * as ts from 'typescript';
-import { getOpenApiVersion, OpenApiVersion } from './utils/getOpenApiVersion';
 
 export enum Language {
     TYPESCRIPT = 'typescript',

src/openApi/v2/index.ts

@@ -1,9 +1,9 @@
-import { OpenApi } from './interfaces/OpenApi';
 import { Client } from '../../client/interfaces/Client';
-import { getServer } from './parser/getServer';
-import { getServices } from './parser/getServices';
+import { OpenApi } from './interfaces/OpenApi';
 import { getModels } from './parser/getModels';
+import { getServer } from './parser/getServer';
 import { getServiceVersion } from './parser/getServiceVersion';
+import { getServices } from './parser/getServices';
 
 /**
  * Parse the OpenAPI specification to a Client model that contains

src/openApi/v2/interfaces/OpenApiParameter.d.ts

@@ -1,6 +1,6 @@
 import { OpenApiItems } from './OpenApiItems';
-import { OpenApiSchema } from './OpenApiSchema';
 import { OpenApiReference } from './OpenApiReference';
+import { OpenApiSchema } from './OpenApiSchema';
 
 /**
  * https://github.com/OAI/OpenAPI-Specification/blob/master/versions/2.0.md#parameterObject

src/openApi/v2/interfaces/OpenApiResponse.d.ts

@@ -1,8 +1,8 @@
 import { Dictionary } from '../../../utils/types';
 import { OpenApiExample } from './OpenApiExample';
 import { OpenApiHeader } from './OpenApiHeader';
-import { OpenApiSchema } from './OpenApiSchema';
 import { OpenApiReference } from './OpenApiReference';
+import { OpenApiSchema } from './OpenApiSchema';
 
 /**
  * https://github.com/OAI/OpenAPI-Specification/blob/master/versions/2.0.md#responseObject

src/openApi/v2/interfaces/OpenApiSchema.d.ts

@@ -1,7 +1,7 @@
 import { Dictionary } from '../../../utils/types';
 import { OpenApiExternalDocs } from './OpenApiExternalDocs';
-import { OpenApiXml } from './OpenApiXml';
 import { OpenApiReference } from './OpenApiReference';
+import { OpenApiXml } from './OpenApiXml';
 
 /**
  * https://github.com/OAI/OpenAPI-Specification/blob/master/versions/2.0.md#schemaObject

src/openApi/v2/parser/getModel.ts

@@ -1,13 +1,13 @@
+import { Model } from '../../../client/interfaces/Model';
 import { OpenApi } from '../interfaces/OpenApi';
 import { OpenApiSchema } from '../interfaces/OpenApiSchema';
-import { getComment } from './getComment';
-import { getType } from './getType';
-import { Model } from '../../../client/interfaces/Model';
 import { PrimaryType } from './constants';
-import { getEnumType } from './getEnumType';
+import { getComment } from './getComment';
 import { getEnum } from './getEnum';
 import { getEnumFromDescription } from './getEnumFromDescription';
+import { getEnumType } from './getEnumType';
 import { getModelProperties } from './getModelProperties';
+import { getType } from './getType';
 
 export function getModel(openApi: OpenApi, definition: OpenApiSchema, isProperty: boolean = false, name: string = ''): Model {
     const model: Model = {
@@ -20,8 +20,8 @@ export function getModel(openApi: OpenApi, definition: OpenApiSchema, isProperty
         description: getComment(definition.description),
         isProperty: isProperty,
         isReadOnly: definition.readOnly || false,
-        isRequired: false,
         isNullable: false,
+        isRequired: false,
         imports: [],
         extends: [],
         enum: [],

src/openApi/v2/parser/getModelProperties.ts

@@ -1,9 +1,9 @@
+import { Model } from '../../../client/interfaces/Model';
 import { OpenApi } from '../interfaces/OpenApi';
 import { OpenApiSchema } from '../interfaces/OpenApiSchema';
 import { getComment } from './getComment';
-import { getType } from './getType';
-import { Model } from '../../../client/interfaces/Model';
 import { getModel } from './getModel';
+import { getType } from './getType';
 
 export function getModelProperties(openApi: OpenApi, definition: OpenApiSchema): Model[] {
     const models: Model[] = [];

src/openApi/v2/parser/getOperation.ts

@@ -1,15 +1,14 @@
-import { Service } from '../../../client/interfaces/Service';
-import { getServiceClassName } from './getServiceClassName';
-import { OpenApiOperation } from '../interfaces/OpenApiOperation';
-import { getOperationName } from './getOperationName';
-import { getOperationPath } from './getOperationPath';
 import { OpenApi } from '../interfaces/OpenApi';
-import { getComment } from './getComment';
+import { OpenApiOperation } from '../interfaces/OpenApiOperation';
 import { Operation } from '../../../client/interfaces/Operation';
+import { getComment } from './getComment';
+import { getOperationErrors } from './getOperationErrors';
+import { getOperationName } from './getOperationName';
 import { getOperationParameters } from './getOperationParameters';
+import { getOperationPath } from './getOperationPath';
 import { getOperationResponses } from './getOperationResponses';
 import { getOperationResults } from './getOperationResults';
-import { getOperationErrors } from './getOperationErrors';
+import { getServiceClassName } from './getServiceClassName';
 
 export function getOperation(openApi: OpenApi, url: string, method: string, op: OpenApiOperation): Operation {
     const serviceName = (op.tags && op.tags[0]) || 'Service';