From ca2174c64bf8c91ba7dbf9fa9785fb15e8a093d5 Mon Sep 17 00:00:00 2001 From: Ferdi Koomen Date: Fri, 6 Mar 2020 21:27:45 +0100 Subject: [PATCH] - Better import sorter --- .eslintrc.json | 6 ++++-- package.json | 2 +- src/index.ts | 6 +++--- src/openApi/v2/index.ts | 2 +- src/openApi/v2/interfaces/OpenApiParameter.d.ts | 2 +- src/openApi/v2/interfaces/OpenApiSchema.d.ts | 2 +- src/openApi/v2/parser/getComment.spec.ts | 1 + src/openApi/v2/parser/getOperation.ts | 2 +- src/openApi/v2/parser/getOperationParameter.ts | 2 +- .../v2/parser/getOperationParameterDefault.ts | 2 +- src/openApi/v2/parser/getOperationParameters.ts | 2 +- src/openApi/v2/parser/getOperationResponse.ts | 2 +- src/openApi/v2/parser/getOperationResponses.ts | 2 +- src/openApi/v2/parser/getServices.ts | 4 ++-- src/openApi/v2/parser/getType.ts | 2 +- src/openApi/v3/index.ts | 2 +- src/openApi/v3/interfaces/OpenApiSchema.d.ts | 2 +- src/openApi/v3/parser/getComment.spec.ts | 1 + src/openApi/v3/parser/getContent.ts | 2 +- src/openApi/v3/parser/getOperation.ts | 2 +- src/openApi/v3/parser/getOperationParameter.ts | 2 +- src/openApi/v3/parser/getOperationParameters.ts | 2 +- src/openApi/v3/parser/getOperationRequestBody.ts | 2 +- src/openApi/v3/parser/getOperationResponse.ts | 2 +- src/openApi/v3/parser/getOperationResponses.ts | 2 +- src/openApi/v3/parser/getServices.ts | 4 ++-- src/openApi/v3/parser/getType.ts | 2 +- src/utils/getOpenApiSpec.spec.ts | 1 + src/utils/getOpenApiSpec.ts | 2 +- src/utils/readHandlebarsTemplate.spec.ts | 1 + src/utils/readHandlebarsTemplate.ts | 2 +- src/utils/readHandlebarsTemplates.spec.ts | 1 + src/utils/readHandlebarsTemplates.ts | 3 ++- src/utils/writeClient.spec.ts | 1 + src/utils/writeClient.ts | 1 + src/utils/writeClientIndex.spec.ts | 1 + src/utils/writeClientIndex.ts | 3 ++- src/utils/writeClientModels.spec.ts | 1 + src/utils/writeClientModels.ts | 3 ++- src/utils/writeClientSchemas.spec.ts | 1 + src/utils/writeClientSchemas.ts | 3 ++- src/utils/writeClientServices.spec.ts | 1 + src/utils/writeClientServices.ts | 3 ++- src/utils/writeClientSettings.ts | 1 + yarn.lock | 12 +++++------- 45 files changed, 61 insertions(+), 44 deletions(-) diff --git a/.eslintrc.json b/.eslintrc.json index e7324f4d..2536fd48 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -11,7 +11,7 @@ "jest": true }, "plugins": [ - "sort-imports-es6-autofix" + "simple-import-sort" ], "rules": { "@typescript-eslint/no-explicit-any": 0, @@ -19,7 +19,9 @@ "@typescript-eslint/no-non-null-assertion": 0, "@typescript-eslint/ban-ts-ignore": 0, "@typescript-eslint/explicit-function-return-type": 0, - "sort-imports-es6-autofix/sort-imports-es6": "error", + "sort-imports": "off", + "import/order": "off", + "simple-import-sort/sort": "error", "prettier/prettier": ["error"] } } diff --git a/package.json b/package.json index f54f34ba..e3535ce0 100644 --- a/package.json +++ b/package.json @@ -85,7 +85,7 @@ "eslint": "6.8.0", "eslint-config-prettier": "6.10.0", "eslint-plugin-prettier": "3.1.2", - "eslint-plugin-sort-imports-es6-autofix": "0.5.0", + "eslint-plugin-simple-import-sort": "5.0.1", "jest": "25.1.0", "jest-cli": "25.1.0", "prettier": "1.19.1", diff --git a/src/index.ts b/src/index.ts index 77c1f91a..f02f33be 100644 --- a/src/index.ts +++ b/src/index.ts @@ -1,8 +1,8 @@ -import { OpenApiVersion, getOpenApiVersion } from './utils/getOpenApiVersion'; -import { getOpenApiSpec } from './utils/getOpenApiSpec'; -import { isString } from './utils/isString'; import { parse as parseV2 } from './openApi/v2'; import { parse as parseV3 } from './openApi/v3'; +import { getOpenApiSpec } from './utils/getOpenApiSpec'; +import { getOpenApiVersion, OpenApiVersion } from './utils/getOpenApiVersion'; +import { isString } from './utils/isString'; import { postProcessClient } from './utils/postProcessClient'; import { readHandlebarsTemplates } from './utils/readHandlebarsTemplates'; import { writeClient } from './utils/writeClient'; diff --git a/src/openApi/v2/index.ts b/src/openApi/v2/index.ts index 4f9055a9..342bede8 100644 --- a/src/openApi/v2/index.ts +++ b/src/openApi/v2/index.ts @@ -2,8 +2,8 @@ import { Client } from '../../client/interfaces/Client'; 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'; +import { getServiceVersion } from './parser/getServiceVersion'; /** * Parse the OpenAPI specification to a Client model that contains diff --git a/src/openApi/v2/interfaces/OpenApiParameter.d.ts b/src/openApi/v2/interfaces/OpenApiParameter.d.ts index 0891aa1f..9eb713cd 100644 --- a/src/openApi/v2/interfaces/OpenApiParameter.d.ts +++ b/src/openApi/v2/interfaces/OpenApiParameter.d.ts @@ -1,7 +1,7 @@ +import { WithEnumExtension } from './Extensions/WithEnumExtension'; import { OpenApiItems } from './OpenApiItems'; import { OpenApiReference } from './OpenApiReference'; import { OpenApiSchema } from './OpenApiSchema'; -import { WithEnumExtension } from './Extensions/WithEnumExtension'; /** * https://github.com/OAI/OpenAPI-Specification/blob/master/versions/2.0.md#parameterObject diff --git a/src/openApi/v2/interfaces/OpenApiSchema.d.ts b/src/openApi/v2/interfaces/OpenApiSchema.d.ts index 71f73901..110c2a17 100644 --- a/src/openApi/v2/interfaces/OpenApiSchema.d.ts +++ b/src/openApi/v2/interfaces/OpenApiSchema.d.ts @@ -1,8 +1,8 @@ import { Dictionary } from '../../../utils/types'; +import { WithEnumExtension } from './Extensions/WithEnumExtension'; import { OpenApiExternalDocs } from './OpenApiExternalDocs'; import { OpenApiReference } from './OpenApiReference'; import { OpenApiXml } from './OpenApiXml'; -import { WithEnumExtension } from './Extensions/WithEnumExtension'; /** * https://github.com/OAI/OpenAPI-Specification/blob/master/versions/2.0.md#schemaObject diff --git a/src/openApi/v2/parser/getComment.spec.ts b/src/openApi/v2/parser/getComment.spec.ts index 01db9c88..1288212d 100644 --- a/src/openApi/v2/parser/getComment.spec.ts +++ b/src/openApi/v2/parser/getComment.spec.ts @@ -1,4 +1,5 @@ import { EOL } from 'os'; + import { getComment } from './getComment'; describe('getComment', () => { diff --git a/src/openApi/v2/parser/getOperation.ts b/src/openApi/v2/parser/getOperation.ts index 558523d7..1f8d3990 100644 --- a/src/openApi/v2/parser/getOperation.ts +++ b/src/openApi/v2/parser/getOperation.ts @@ -1,6 +1,6 @@ +import { Operation } from '../../../client/interfaces/Operation'; import { OpenApi } from '../interfaces/OpenApi'; import { OpenApiOperation } from '../interfaces/OpenApiOperation'; -import { Operation } from '../../../client/interfaces/Operation'; import { getComment } from './getComment'; import { getOperationErrors } from './getOperationErrors'; import { getOperationName } from './getOperationName'; diff --git a/src/openApi/v2/parser/getOperationParameter.ts b/src/openApi/v2/parser/getOperationParameter.ts index c962c488..665c5985 100644 --- a/src/openApi/v2/parser/getOperationParameter.ts +++ b/src/openApi/v2/parser/getOperationParameter.ts @@ -1,6 +1,6 @@ +import { OperationParameter } from '../../../client/interfaces/OperationParameter'; import { OpenApi } from '../interfaces/OpenApi'; import { OpenApiParameter } from '../interfaces/OpenApiParameter'; -import { OperationParameter } from '../../../client/interfaces/OperationParameter'; import { PrimaryType } from './constants'; import { extendEnum } from './extendEnum'; import { getComment } from './getComment'; diff --git a/src/openApi/v2/parser/getOperationParameterDefault.ts b/src/openApi/v2/parser/getOperationParameterDefault.ts index 4420dd96..5471c213 100644 --- a/src/openApi/v2/parser/getOperationParameterDefault.ts +++ b/src/openApi/v2/parser/getOperationParameterDefault.ts @@ -1,5 +1,5 @@ -import { OpenApiParameter } from '../interfaces/OpenApiParameter'; import { OperationParameter } from '../../../client/interfaces/OperationParameter'; +import { OpenApiParameter } from '../interfaces/OpenApiParameter'; export function getOperationParameterDefault(parameter: OpenApiParameter, operationParameter: OperationParameter): string | null { if (parameter.default === null) { diff --git a/src/openApi/v2/parser/getOperationParameters.ts b/src/openApi/v2/parser/getOperationParameters.ts index d8e99d87..073c3822 100644 --- a/src/openApi/v2/parser/getOperationParameters.ts +++ b/src/openApi/v2/parser/getOperationParameters.ts @@ -1,6 +1,6 @@ +import { OperationParameters } from '../../../client/interfaces/OperationParameters'; import { OpenApi } from '../interfaces/OpenApi'; import { OpenApiParameter } from '../interfaces/OpenApiParameter'; -import { OperationParameters } from '../../../client/interfaces/OperationParameters'; import { getOperationParameter } from './getOperationParameter'; import { getRef } from './getRef'; import { sortByRequired } from './sortByRequired'; diff --git a/src/openApi/v2/parser/getOperationResponse.ts b/src/openApi/v2/parser/getOperationResponse.ts index 26e734c6..4b96a5a5 100644 --- a/src/openApi/v2/parser/getOperationResponse.ts +++ b/src/openApi/v2/parser/getOperationResponse.ts @@ -1,6 +1,6 @@ +import { OperationResponse } from '../../../client/interfaces/OperationResponse'; import { OpenApi } from '../interfaces/OpenApi'; import { OpenApiResponse } from '../interfaces/OpenApiResponse'; -import { OperationResponse } from '../../../client/interfaces/OperationResponse'; import { PrimaryType } from './constants'; import { getComment } from './getComment'; import { getModel } from './getModel'; diff --git a/src/openApi/v2/parser/getOperationResponses.ts b/src/openApi/v2/parser/getOperationResponses.ts index dd1f5ac5..46d750b5 100644 --- a/src/openApi/v2/parser/getOperationResponses.ts +++ b/src/openApi/v2/parser/getOperationResponses.ts @@ -1,7 +1,7 @@ +import { OperationResponse } from '../../../client/interfaces/OperationResponse'; import { OpenApi } from '../interfaces/OpenApi'; import { OpenApiResponse } from '../interfaces/OpenApiResponse'; import { OpenApiResponses } from '../interfaces/OpenApiResponses'; -import { OperationResponse } from '../../../client/interfaces/OperationResponse'; import { getOperationResponse } from './getOperationResponse'; import { getOperationResponseCode } from './getOperationResponseCode'; import { getRef } from './getRef'; diff --git a/src/openApi/v2/parser/getServices.ts b/src/openApi/v2/parser/getServices.ts index 2b72cb01..db259c87 100644 --- a/src/openApi/v2/parser/getServices.ts +++ b/src/openApi/v2/parser/getServices.ts @@ -1,6 +1,6 @@ -import { Method } from './constants'; -import { OpenApi } from '../interfaces/OpenApi'; import { Service } from '../../../client/interfaces/Service'; +import { OpenApi } from '../interfaces/OpenApi'; +import { Method } from './constants'; import { getOperation } from './getOperation'; /** diff --git a/src/openApi/v2/parser/getType.ts b/src/openApi/v2/parser/getType.ts index e9fb22d5..1cf8de66 100644 --- a/src/openApi/v2/parser/getType.ts +++ b/src/openApi/v2/parser/getType.ts @@ -1,5 +1,5 @@ -import { PrimaryType } from './constants'; import { Type } from '../../../client/interfaces/Type'; +import { PrimaryType } from './constants'; import { getMappedType, hasMappedType } from './getMappedType'; import { stripNamespace } from './stripNamespace'; diff --git a/src/openApi/v3/index.ts b/src/openApi/v3/index.ts index 4f9055a9..342bede8 100644 --- a/src/openApi/v3/index.ts +++ b/src/openApi/v3/index.ts @@ -2,8 +2,8 @@ import { Client } from '../../client/interfaces/Client'; 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'; +import { getServiceVersion } from './parser/getServiceVersion'; /** * Parse the OpenAPI specification to a Client model that contains diff --git a/src/openApi/v3/interfaces/OpenApiSchema.d.ts b/src/openApi/v3/interfaces/OpenApiSchema.d.ts index 3bbf59e3..aa7cfd6e 100644 --- a/src/openApi/v3/interfaces/OpenApiSchema.d.ts +++ b/src/openApi/v3/interfaces/OpenApiSchema.d.ts @@ -1,9 +1,9 @@ import { Dictionary } from '../../../utils/types'; +import { WithEnumExtension } from './Extensions/WithEnumExtension'; import { OpenApiDiscriminator } from './OpenApiDiscriminator'; import { OpenApiExternalDocs } from './OpenApiExternalDocs'; import { OpenApiReference } from './OpenApiReference'; import { OpenApiXml } from './OpenApiXml'; -import { WithEnumExtension } from './Extensions/WithEnumExtension'; /** * https://github.com/OAI/OpenAPI-Specification/blob/master/versions/3.0.2.md#schemaObject diff --git a/src/openApi/v3/parser/getComment.spec.ts b/src/openApi/v3/parser/getComment.spec.ts index 01db9c88..1288212d 100644 --- a/src/openApi/v3/parser/getComment.spec.ts +++ b/src/openApi/v3/parser/getComment.spec.ts @@ -1,4 +1,5 @@ import { EOL } from 'os'; + import { getComment } from './getComment'; describe('getComment', () => { diff --git a/src/openApi/v3/parser/getContent.ts b/src/openApi/v3/parser/getContent.ts index 6cddfa30..86b96c3a 100644 --- a/src/openApi/v3/parser/getContent.ts +++ b/src/openApi/v3/parser/getContent.ts @@ -1,8 +1,8 @@ -import { ContentType } from './constants'; import { Dictionary } from '../../../utils/types'; import { OpenApi } from '../interfaces/OpenApi'; import { OpenApiMediaType } from '../interfaces/OpenApiMediaType'; import { OpenApiSchema } from '../interfaces/OpenApiSchema'; +import { ContentType } from './constants'; export function getContent(openApi: OpenApi, content: Dictionary): OpenApiSchema | null { /* prettier-ignore */ diff --git a/src/openApi/v3/parser/getOperation.ts b/src/openApi/v3/parser/getOperation.ts index e0cfa8b9..71e33c78 100644 --- a/src/openApi/v3/parser/getOperation.ts +++ b/src/openApi/v3/parser/getOperation.ts @@ -1,6 +1,6 @@ +import { Operation } from '../../../client/interfaces/Operation'; import { OpenApi } from '../interfaces/OpenApi'; import { OpenApiOperation } from '../interfaces/OpenApiOperation'; -import { Operation } from '../../../client/interfaces/Operation'; import { getComment } from './getComment'; import { getOperationErrors } from './getOperationErrors'; import { getOperationName } from './getOperationName'; diff --git a/src/openApi/v3/parser/getOperationParameter.ts b/src/openApi/v3/parser/getOperationParameter.ts index 0c6b42df..73a12b73 100644 --- a/src/openApi/v3/parser/getOperationParameter.ts +++ b/src/openApi/v3/parser/getOperationParameter.ts @@ -1,6 +1,6 @@ +import { OperationParameter } from '../../../client/interfaces/OperationParameter'; import { OpenApi } from '../interfaces/OpenApi'; import { OpenApiParameter } from '../interfaces/OpenApiParameter'; -import { OperationParameter } from '../../../client/interfaces/OperationParameter'; import { PrimaryType } from './constants'; import { getComment } from './getComment'; import { getModel } from './getModel'; diff --git a/src/openApi/v3/parser/getOperationParameters.ts b/src/openApi/v3/parser/getOperationParameters.ts index a5fe313a..4dcd86a8 100644 --- a/src/openApi/v3/parser/getOperationParameters.ts +++ b/src/openApi/v3/parser/getOperationParameters.ts @@ -1,6 +1,6 @@ +import { OperationParameters } from '../../../client/interfaces/OperationParameters'; import { OpenApi } from '../interfaces/OpenApi'; import { OpenApiParameter } from '../interfaces/OpenApiParameter'; -import { OperationParameters } from '../../../client/interfaces/OperationParameters'; import { getOperationParameter } from './getOperationParameter'; import { getRef } from './getRef'; import { sortByRequired } from './sortByRequired'; diff --git a/src/openApi/v3/parser/getOperationRequestBody.ts b/src/openApi/v3/parser/getOperationRequestBody.ts index e6fb5e5c..da4db676 100644 --- a/src/openApi/v3/parser/getOperationRequestBody.ts +++ b/src/openApi/v3/parser/getOperationRequestBody.ts @@ -1,6 +1,6 @@ +import { OperationParameter } from '../../../client/interfaces/OperationParameter'; import { OpenApi } from '../interfaces/OpenApi'; import { OpenApiRequestBody } from '../interfaces/OpenApiRequestBody'; -import { OperationParameter } from '../../../client/interfaces/OperationParameter'; import { PrimaryType } from './constants'; import { getComment } from './getComment'; import { getContent } from './getContent'; diff --git a/src/openApi/v3/parser/getOperationResponse.ts b/src/openApi/v3/parser/getOperationResponse.ts index 895fb807..35c5f786 100644 --- a/src/openApi/v3/parser/getOperationResponse.ts +++ b/src/openApi/v3/parser/getOperationResponse.ts @@ -1,6 +1,6 @@ +import { OperationResponse } from '../../../client/interfaces/OperationResponse'; import { OpenApi } from '../interfaces/OpenApi'; import { OpenApiResponse } from '../interfaces/OpenApiResponse'; -import { OperationResponse } from '../../../client/interfaces/OperationResponse'; import { PrimaryType } from './constants'; import { getComment } from './getComment'; import { getContent } from './getContent'; diff --git a/src/openApi/v3/parser/getOperationResponses.ts b/src/openApi/v3/parser/getOperationResponses.ts index 87621291..cd608f9b 100644 --- a/src/openApi/v3/parser/getOperationResponses.ts +++ b/src/openApi/v3/parser/getOperationResponses.ts @@ -1,7 +1,7 @@ +import { OperationResponse } from '../../../client/interfaces/OperationResponse'; import { OpenApi } from '../interfaces/OpenApi'; import { OpenApiResponse } from '../interfaces/OpenApiResponse'; import { OpenApiResponses } from '../interfaces/OpenApiResponses'; -import { OperationResponse } from '../../../client/interfaces/OperationResponse'; import { getOperationResponse } from './getOperationResponse'; import { getOperationResponseCode } from './getOperationResponseCode'; import { getRef } from './getRef'; diff --git a/src/openApi/v3/parser/getServices.ts b/src/openApi/v3/parser/getServices.ts index ac61a2c8..447c6cc2 100644 --- a/src/openApi/v3/parser/getServices.ts +++ b/src/openApi/v3/parser/getServices.ts @@ -1,6 +1,6 @@ -import { Method } from './constants'; -import { OpenApi } from '../interfaces/OpenApi'; import { Service } from '../../../client/interfaces/Service'; +import { OpenApi } from '../interfaces/OpenApi'; +import { Method } from './constants'; import { getOperation } from './getOperation'; /** diff --git a/src/openApi/v3/parser/getType.ts b/src/openApi/v3/parser/getType.ts index 617d68fd..866dd5ed 100644 --- a/src/openApi/v3/parser/getType.ts +++ b/src/openApi/v3/parser/getType.ts @@ -1,5 +1,5 @@ -import { PrimaryType } from './constants'; import { Type } from '../../../client/interfaces/Type'; +import { PrimaryType } from './constants'; import { getMappedType, hasMappedType } from './getMappedType'; import { stripNamespace } from './stripNamespace'; diff --git a/src/utils/getOpenApiSpec.spec.ts b/src/utils/getOpenApiSpec.spec.ts index 22735d1a..73aee617 100644 --- a/src/utils/getOpenApiSpec.spec.ts +++ b/src/utils/getOpenApiSpec.spec.ts @@ -1,4 +1,5 @@ import * as fs from 'fs'; + import { getOpenApiSpec } from './getOpenApiSpec'; jest.mock('fs'); diff --git a/src/utils/getOpenApiSpec.ts b/src/utils/getOpenApiSpec.ts index a75f31d5..c1d1470d 100644 --- a/src/utils/getOpenApiSpec.ts +++ b/src/utils/getOpenApiSpec.ts @@ -1,6 +1,6 @@ import * as fs from 'fs'; -import * as path from 'path'; import * as yaml from 'js-yaml'; +import * as path from 'path'; /** * Check if given file exists and try to read the content as string. diff --git a/src/utils/readHandlebarsTemplate.spec.ts b/src/utils/readHandlebarsTemplate.spec.ts index 7ec2d254..2f940548 100644 --- a/src/utils/readHandlebarsTemplate.spec.ts +++ b/src/utils/readHandlebarsTemplate.spec.ts @@ -1,4 +1,5 @@ import * as fs from 'fs'; + import { readHandlebarsTemplate } from './readHandlebarsTemplate'; jest.mock('fs'); diff --git a/src/utils/readHandlebarsTemplate.ts b/src/utils/readHandlebarsTemplate.ts index fa3ea1ec..31c2b0da 100644 --- a/src/utils/readHandlebarsTemplate.ts +++ b/src/utils/readHandlebarsTemplate.ts @@ -1,5 +1,5 @@ -import * as Handlebars from 'handlebars'; import * as fs from 'fs'; +import * as Handlebars from 'handlebars'; /** * Read and compile the Handlebars template. diff --git a/src/utils/readHandlebarsTemplates.spec.ts b/src/utils/readHandlebarsTemplates.spec.ts index 531b1f72..37f49037 100644 --- a/src/utils/readHandlebarsTemplates.spec.ts +++ b/src/utils/readHandlebarsTemplates.spec.ts @@ -1,5 +1,6 @@ import * as fs from 'fs'; import * as glob from 'glob'; + import { readHandlebarsTemplates } from './readHandlebarsTemplates'; jest.mock('fs'); diff --git a/src/utils/readHandlebarsTemplates.ts b/src/utils/readHandlebarsTemplates.ts index 6e81efd0..4f573ef9 100644 --- a/src/utils/readHandlebarsTemplates.ts +++ b/src/utils/readHandlebarsTemplates.ts @@ -1,6 +1,7 @@ -import * as Handlebars from 'handlebars'; import * as glob from 'glob'; +import * as Handlebars from 'handlebars'; import * as path from 'path'; + import { readHandlebarsTemplate } from './readHandlebarsTemplate'; import { registerHandlebarHelpers } from './registerHandlebarHelpers'; diff --git a/src/utils/writeClient.spec.ts b/src/utils/writeClient.spec.ts index a2ad0b57..6d81aee7 100644 --- a/src/utils/writeClient.spec.ts +++ b/src/utils/writeClient.spec.ts @@ -2,6 +2,7 @@ import * as fs from 'fs'; import * as glob from 'glob'; import * as mkdirp from 'mkdirp'; import * as rimraf from 'rimraf'; + import { Client } from '../client/interfaces/Client'; import { HttpClient } from '../index'; import { Templates } from './readHandlebarsTemplates'; diff --git a/src/utils/writeClient.ts b/src/utils/writeClient.ts index bc209dea..da17f36b 100644 --- a/src/utils/writeClient.ts +++ b/src/utils/writeClient.ts @@ -3,6 +3,7 @@ import * as glob from 'glob'; import * as mkdirp from 'mkdirp'; import * as path from 'path'; import * as rimraf from 'rimraf'; + import { Client } from '../client/interfaces/Client'; import { HttpClient } from '../index'; import { Templates } from './readHandlebarsTemplates'; diff --git a/src/utils/writeClientIndex.spec.ts b/src/utils/writeClientIndex.spec.ts index db19737b..2cecb881 100644 --- a/src/utils/writeClientIndex.spec.ts +++ b/src/utils/writeClientIndex.spec.ts @@ -1,5 +1,6 @@ import * as fs from 'fs'; import * as glob from 'glob'; + import { Client } from '../client/interfaces/Client'; import { Templates } from './readHandlebarsTemplates'; import { writeClientIndex } from './writeClientIndex'; diff --git a/src/utils/writeClientIndex.ts b/src/utils/writeClientIndex.ts index b911a4ab..86e872c8 100644 --- a/src/utils/writeClientIndex.ts +++ b/src/utils/writeClientIndex.ts @@ -1,9 +1,10 @@ import * as fs from 'fs'; import * as path from 'path'; + import { Client } from '../client/interfaces/Client'; -import { Templates } from './readHandlebarsTemplates'; import { getModelNames } from './getModelNames'; import { getServiceNames } from './getServiceNames'; +import { Templates } from './readHandlebarsTemplates'; /** * Generate the OpenAPI client index file using the Handlebar template and write it to disk. diff --git a/src/utils/writeClientModels.spec.ts b/src/utils/writeClientModels.spec.ts index cb416e97..1fd34cbc 100644 --- a/src/utils/writeClientModels.spec.ts +++ b/src/utils/writeClientModels.spec.ts @@ -1,4 +1,5 @@ import * as fs from 'fs'; + import { Model } from '../client/interfaces/Model'; import { Templates } from './readHandlebarsTemplates'; import { writeClientModels } from './writeClientModels'; diff --git a/src/utils/writeClientModels.ts b/src/utils/writeClientModels.ts index 40369e08..d0f166f3 100644 --- a/src/utils/writeClientModels.ts +++ b/src/utils/writeClientModels.ts @@ -1,8 +1,9 @@ import * as fs from 'fs'; import * as path from 'path'; + import { Model } from '../client/interfaces/Model'; -import { Templates } from './readHandlebarsTemplates'; import { format } from './format'; +import { Templates } from './readHandlebarsTemplates'; /** * Generate Models using the Handlebar template and write to disk. diff --git a/src/utils/writeClientSchemas.spec.ts b/src/utils/writeClientSchemas.spec.ts index cb416e97..1fd34cbc 100644 --- a/src/utils/writeClientSchemas.spec.ts +++ b/src/utils/writeClientSchemas.spec.ts @@ -1,4 +1,5 @@ import * as fs from 'fs'; + import { Model } from '../client/interfaces/Model'; import { Templates } from './readHandlebarsTemplates'; import { writeClientModels } from './writeClientModels'; diff --git a/src/utils/writeClientSchemas.ts b/src/utils/writeClientSchemas.ts index 493361f7..7e5fd2d5 100644 --- a/src/utils/writeClientSchemas.ts +++ b/src/utils/writeClientSchemas.ts @@ -1,8 +1,9 @@ import * as fs from 'fs'; import * as path from 'path'; + import { Model } from '../client/interfaces/Model'; -import { Templates } from './readHandlebarsTemplates'; import { format } from './format'; +import { Templates } from './readHandlebarsTemplates'; /** * Generate Schemas using the Handlebar template and write to disk. diff --git a/src/utils/writeClientServices.spec.ts b/src/utils/writeClientServices.spec.ts index 6809c498..68a0e797 100644 --- a/src/utils/writeClientServices.spec.ts +++ b/src/utils/writeClientServices.spec.ts @@ -1,4 +1,5 @@ import * as fs from 'fs'; + import { Service } from '../client/interfaces/Service'; import { Templates } from './readHandlebarsTemplates'; import { writeClientServices } from './writeClientServices'; diff --git a/src/utils/writeClientServices.ts b/src/utils/writeClientServices.ts index dc65ff9a..04b0dbb1 100644 --- a/src/utils/writeClientServices.ts +++ b/src/utils/writeClientServices.ts @@ -1,8 +1,9 @@ import * as fs from 'fs'; import * as path from 'path'; + import { Service } from '../client/interfaces/Service'; -import { Templates } from './readHandlebarsTemplates'; import { format } from './format'; +import { Templates } from './readHandlebarsTemplates'; /** * Generate Services using the Handlebar template and write to disk. diff --git a/src/utils/writeClientSettings.ts b/src/utils/writeClientSettings.ts index fb2d6c81..fcb97cad 100644 --- a/src/utils/writeClientSettings.ts +++ b/src/utils/writeClientSettings.ts @@ -1,5 +1,6 @@ import * as fs from 'fs'; import * as path from 'path'; + import { Client } from '../client/interfaces/Client'; import { HttpClient } from '../index'; import { Templates } from './readHandlebarsTemplates'; diff --git a/yarn.lock b/yarn.lock index 0d754293..41bdedf4 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1889,12 +1889,10 @@ eslint-plugin-prettier@3.1.2: dependencies: prettier-linter-helpers "^1.0.0" -eslint-plugin-sort-imports-es6-autofix@0.5.0: - version "0.5.0" - resolved "https://registry.yarnpkg.com/eslint-plugin-sort-imports-es6-autofix/-/eslint-plugin-sort-imports-es6-autofix-0.5.0.tgz#dabae09a457eac6e95c52d8edd7855f576d014b6" - integrity sha512-KEX2Uz6bAs67jDYiH/OT1xz1E7AzIJJOIRg1F7OnFAfUVlpws3ldSZj5oZySRHfoVkWqDX9GGExYxckdLrWhwg== - dependencies: - eslint "^6.2.2" +eslint-plugin-simple-import-sort@5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/eslint-plugin-simple-import-sort/-/eslint-plugin-simple-import-sort-5.0.1.tgz#fd47d3ed2af30db3dd2cadaed285ad510dde479b" + integrity sha512-s6Hjp9rcIDYT1h7tuTulblbY7+XQNZK+014uUkNJSKRXEHZO2i7CTr16HOpfgD9HDnUOpl0fwphPsr0oxZqgGg== eslint-scope@^5.0.0: version "5.0.0" @@ -1916,7 +1914,7 @@ eslint-visitor-keys@^1.1.0: resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.1.0.tgz#e2a82cea84ff246ad6fb57f9bde5b46621459ec2" integrity sha512-8y9YjtM1JBJU/A9Kc+SbaOV4y29sSWckBwMHa+FGtVj5gN/sbnKDf6xJUl+8g7FAij9LVaP8C24DUiH/f/2Z9A== -eslint@6.8.0, eslint@^6.2.2: +eslint@6.8.0: version "6.8.0" resolved "https://registry.yarnpkg.com/eslint/-/eslint-6.8.0.tgz#62262d6729739f9275723824302fb227c8c93ffb" integrity sha512-K+Iayyo2LtyYhDSYwz5D5QdWw0hCacNzyq1Y821Xna2xSJj7cijoLLYmLxTQgcgZ9mC61nryMy9S7GRbYpI5Ig==