Skip to content

Commit ca2174c

Browse files
committed
- Better import sorter
1 parent e32c4be commit ca2174c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+61
-44
lines changed

.eslintrc.json

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,17 @@
1111
"jest": true
1212
},
1313
"plugins": [
14-
"sort-imports-es6-autofix"
14+
"simple-import-sort"
1515
],
1616
"rules": {
1717
"@typescript-eslint/no-explicit-any": 0,
1818
"@typescript-eslint/no-inferrable-types": 0,
1919
"@typescript-eslint/no-non-null-assertion": 0,
2020
"@typescript-eslint/ban-ts-ignore": 0,
2121
"@typescript-eslint/explicit-function-return-type": 0,
22-
"sort-imports-es6-autofix/sort-imports-es6": "error",
22+
"sort-imports": "off",
23+
"import/order": "off",
24+
"simple-import-sort/sort": "error",
2325
"prettier/prettier": ["error"]
2426
}
2527
}

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@
8585
"eslint": "6.8.0",
8686
"eslint-config-prettier": "6.10.0",
8787
"eslint-plugin-prettier": "3.1.2",
88-
"eslint-plugin-sort-imports-es6-autofix": "0.5.0",
88+
"eslint-plugin-simple-import-sort": "5.0.1",
8989
"jest": "25.1.0",
9090
"jest-cli": "25.1.0",
9191
"prettier": "1.19.1",

src/index.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
import { OpenApiVersion, getOpenApiVersion } from './utils/getOpenApiVersion';
2-
import { getOpenApiSpec } from './utils/getOpenApiSpec';
3-
import { isString } from './utils/isString';
41
import { parse as parseV2 } from './openApi/v2';
52
import { parse as parseV3 } from './openApi/v3';
3+
import { getOpenApiSpec } from './utils/getOpenApiSpec';
4+
import { getOpenApiVersion, OpenApiVersion } from './utils/getOpenApiVersion';
5+
import { isString } from './utils/isString';
66
import { postProcessClient } from './utils/postProcessClient';
77
import { readHandlebarsTemplates } from './utils/readHandlebarsTemplates';
88
import { writeClient } from './utils/writeClient';

src/openApi/v2/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ import { Client } from '../../client/interfaces/Client';
22
import { OpenApi } from './interfaces/OpenApi';
33
import { getModels } from './parser/getModels';
44
import { getServer } from './parser/getServer';
5-
import { getServiceVersion } from './parser/getServiceVersion';
65
import { getServices } from './parser/getServices';
6+
import { getServiceVersion } from './parser/getServiceVersion';
77

88
/**
99
* Parse the OpenAPI specification to a Client model that contains

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1+
import { WithEnumExtension } from './Extensions/WithEnumExtension';
12
import { OpenApiItems } from './OpenApiItems';
23
import { OpenApiReference } from './OpenApiReference';
34
import { OpenApiSchema } from './OpenApiSchema';
4-
import { WithEnumExtension } from './Extensions/WithEnumExtension';
55

66
/**
77
* https://github.com/OAI/OpenAPI-Specification/blob/master/versions/2.0.md#parameterObject

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import { Dictionary } from '../../../utils/types';
2+
import { WithEnumExtension } from './Extensions/WithEnumExtension';
23
import { OpenApiExternalDocs } from './OpenApiExternalDocs';
34
import { OpenApiReference } from './OpenApiReference';
45
import { OpenApiXml } from './OpenApiXml';
5-
import { WithEnumExtension } from './Extensions/WithEnumExtension';
66

77
/**
88
* https://github.com/OAI/OpenAPI-Specification/blob/master/versions/2.0.md#schemaObject

src/openApi/v2/parser/getComment.spec.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import { EOL } from 'os';
2+
23
import { getComment } from './getComment';
34

45
describe('getComment', () => {

src/openApi/v2/parser/getOperation.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1+
import { Operation } from '../../../client/interfaces/Operation';
12
import { OpenApi } from '../interfaces/OpenApi';
23
import { OpenApiOperation } from '../interfaces/OpenApiOperation';
3-
import { Operation } from '../../../client/interfaces/Operation';
44
import { getComment } from './getComment';
55
import { getOperationErrors } from './getOperationErrors';
66
import { getOperationName } from './getOperationName';

src/openApi/v2/parser/getOperationParameter.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1+
import { OperationParameter } from '../../../client/interfaces/OperationParameter';
12
import { OpenApi } from '../interfaces/OpenApi';
23
import { OpenApiParameter } from '../interfaces/OpenApiParameter';
3-
import { OperationParameter } from '../../../client/interfaces/OperationParameter';
44
import { PrimaryType } from './constants';
55
import { extendEnum } from './extendEnum';
66
import { getComment } from './getComment';

src/openApi/v2/parser/getOperationParameterDefault.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import { OpenApiParameter } from '../interfaces/OpenApiParameter';
21
import { OperationParameter } from '../../../client/interfaces/OperationParameter';
2+
import { OpenApiParameter } from '../interfaces/OpenApiParameter';
33

44
export function getOperationParameterDefault(parameter: OpenApiParameter, operationParameter: OperationParameter): string | null {
55
if (parameter.default === null) {

0 commit comments

Comments
 (0)