Skip to content

Commit a0075e7

Browse files
aurelien-reevesaurelien-reeves
committed
Activate eslint-plugin-simple-import-sort
1 parent c28f61b commit a0075e7

File tree

124 files changed

+539
-426
lines changed

Some content is hidden

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

124 files changed

+539
-426
lines changed

‎.eslintrc.yml

+3-1
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,6 @@ rules:
2424
"@typescript-eslint/no-inferrable-types": off
2525
"@typescript-eslint/no-empty-function": off
2626
"@typescript-eslint/ban-types": off
27-
"@typescript-eslint/no-unused-vars": off
27+
"@typescript-eslint/no-unused-vars": off
28+
"simple-import-sort/imports": "error"
29+
"simple-import-sort/exports": "error"

‎compatibility/cck_spec.ts

+7-6
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,20 @@
1-
import { describe, it } from 'mocha'
1+
import * as messageStreams from '@cucumber/message-streams'
2+
import * as messages from '@cucumber/messages'
23
import { config, expect, use } from 'chai'
34
import chaiExclude from 'chai-exclude'
4-
import glob from 'glob'
55
import fs from 'fs'
6+
import glob from 'glob'
7+
import { describe, it } from 'mocha'
68
import path from 'path'
79
import { PassThrough, pipeline, Writable } from 'stream'
8-
import { Cli } from '../src'
910
import toString from 'stream-to-string'
11+
import util from 'util'
12+
1013
import {
1114
ignorableKeys,
1215
normalizeMessageOutput,
1316
} from '../features/support/formatter_output_helpers'
14-
import * as messages from '@cucumber/messages'
15-
import * as messageStreams from '@cucumber/message-streams'
16-
import util from 'util'
17+
import { Cli } from '../src'
1718

1819
const asyncPipeline = util.promisify(pipeline)
1920
const PROJECT_PATH = path.join(__dirname, '..')

‎compatibility/features/attachments/attachments.ts

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
1-
import { Before, When, World } from '../../../src'
2-
import { ReadableStreamBuffer } from 'stream-buffers'
31
import fs from 'fs'
42
import path from 'path'
3+
import { ReadableStreamBuffer } from 'stream-buffers'
4+
5+
import { Before, When, World } from '../../../src'
56

67
Before((): void => undefined)
78

‎compatibility/features/data-tables/data-tables.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
import { When, Then, DataTable } from '../../../src'
21
import { expect } from 'chai'
32

3+
import { DataTable, Then, When } from '../../../src'
4+
45
When(
56
'the following table is transposed:',
67
function (this: any, table: DataTable) {

‎compatibility/features/examples-tables/examples-tables.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import assert from 'assert'
2-
import { Given, When, Then } from '../../../src'
2+
3+
import { Given, Then, When } from '../../../src'
34

45
Given('there are {int} cucumbers', function (this: any, initialCount: number) {
56
this.count = initialCount

‎compatibility/features/hooks/hooks.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
1-
import { When, Before, After, World } from '../../../src'
21
import fs from 'fs'
32
import path from 'path'
43

4+
import { After, Before, When, World } from '../../../src'
5+
56
Before(function () {
67
// no-op
78
})

‎compatibility/features/markdown/markdown.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import assert from 'assert'
2-
import { Given, DataTable, Then, When, World } from '../../../src'
2+
3+
import { DataTable, Given, Then, When, World } from '../../../src'
34

45
Given('some TypeScript code:', function (dataTable: DataTable) {
56
assert(dataTable)

‎compatibility/features/minimal/minimal.ts

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import assert from 'assert'
2+
23
import { Given } from '../../../src'
34

45
Given('I have {int} cukes in my belly', function (cukeCount: number) {

‎compatibility/features/parameter-types/parameter-types.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
import { Given, defineParameterType } from '../../../src'
21
import { expect } from 'chai'
32

3+
import { defineParameterType, Given } from '../../../src'
4+
45
class Flight {
56
constructor(public readonly from: string, public readonly to: string) {}
67
}

‎compatibility/features/rules/rules.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import assert from 'assert'
2-
import { Given, When, Then } from '../../../src'
2+
3+
import { Given, Then, When } from '../../../src'
34

45
Given(
56
'there are {int} {float} coins inside',

‎features/step_definitions/cli_steps.ts

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
1-
import { DataTable, Then, When } from '../../'
21
import { expect } from 'chai'
3-
import { normalizeText } from '../support/helpers'
4-
import stringArgv from 'string-argv'
52
import Mustache from 'mustache'
3+
import stringArgv from 'string-argv'
4+
5+
import { DataTable, Then, When } from '../../'
66
import {
77
doesHaveValue,
88
doesNotHaveValue,
99
valueOrDefault,
1010
} from '../../src/value_checker'
11+
import { normalizeText } from '../support/helpers'
1112
import { World } from '../support/world'
1213

1314
const { version } = require('../../package.json') // eslint-disable-line @typescript-eslint/no-var-requires

‎features/step_definitions/file_steps.ts

+5-4
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
1-
import { Given, Then } from '../../'
21
import { expect } from 'chai'
3-
import { normalizeText } from '../support/helpers'
4-
import fs from 'mz/fs'
52
import fsExtra from 'fs-extra'
6-
import path from 'path'
73
import Mustache from 'mustache'
4+
import fs from 'mz/fs'
5+
import path from 'path'
6+
7+
import { Given, Then } from '../../'
8+
import { normalizeText } from '../support/helpers'
89
import { World } from '../support/world'
910

1011
Given(

‎features/step_definitions/formatter_steps.ts

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
1-
import { Then } from '../../'
21
import { expect, use } from 'chai'
32
import chaiExclude from 'chai-exclude'
3+
import fs from 'mz/fs'
4+
import path from 'path'
5+
6+
import { Then } from '../../'
47
import {
58
ignorableKeys,
69
normalizeJsonOutput,
710
normalizeMessageOutput,
811
stripMetaMessages,
912
} from '../support/formatter_output_helpers'
10-
import fs from 'mz/fs'
11-
import path from 'path'
1213
import { World } from '../support/world'
1314

1415
use(chaiExclude)

‎features/step_definitions/message_steps.ts

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
1-
import { Then } from '../../'
1+
import * as messages from '@cucumber/messages'
22
import { expect } from 'chai'
3+
import semver from 'semver'
4+
5+
import { Then } from '../../'
36
import DataTable from '../../src/models/data_table'
47
import {
58
getPickleNamesInOrderOfExecution,
@@ -9,9 +12,7 @@ import {
912
getTestStepAttachmentsForStep,
1013
getTestStepResults,
1114
} from '../support/message_helpers'
12-
import * as messages from '@cucumber/messages'
1315
import { World } from '../support/world'
14-
import semver from 'semver'
1516

1617
const ENCODING_MAP: { [key: string]: messages.AttachmentContentEncoding } = {
1718
IDENTITY: messages.AttachmentContentEncoding.IDENTITY,

‎features/step_definitions/report_server_steps.ts

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
1-
import { Given, Then, DataTable } from '../..'
2-
import { World } from '../support/world'
1+
import assert from 'assert'
32
import { expect } from 'chai'
43
import { URL } from 'url'
4+
5+
import { DataTable, Given, Then } from '../..'
56
import FakeReportServer from '../../test/fake_report_server'
6-
import assert from 'assert'
7+
import { World } from '../support/world'
78

89
Given(
910
'a report server is running on {string}',

‎features/step_definitions/usage_json_steps.ts

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1-
import { DataTable, Then } from '../../'
21
import { expect } from 'chai'
32
import path from 'path'
4-
import { World } from '../support/world'
3+
4+
import { DataTable, Then } from '../../'
55
import { IUsage } from '../../src/formatter/helpers/usage_helpers'
6+
import { World } from '../support/world'
67

78
Then('it outputs the usage data:', function (this: World, table: DataTable) {
89
const usageData: IUsage[] = JSON.parse(this.lastRun.output)

‎features/support/formatter_output_helpers.ts

+7-6
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
1-
import {
2-
doesHaveValue,
3-
doesNotHaveValue,
4-
valueOrDefault,
5-
} from '../../src/value_checker'
1+
import * as messages from '@cucumber/messages'
2+
63
import {
74
IJsonFeature,
85
IJsonScenario,
96
IJsonStep,
107
} from '../../src/formatter/json_formatter'
11-
import * as messages from '@cucumber/messages'
8+
import {
9+
doesHaveValue,
10+
doesNotHaveValue,
11+
valueOrDefault,
12+
} from '../../src/value_checker'
1213

1314
// Converting windows stack trace to posix and removing cwd
1415
// C:\\project\\path\\features\\support/code.js

‎features/support/helpers.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
import path from 'path'
21
import figures from 'figures'
2+
import path from 'path'
3+
34
import { normalizeSummaryDuration } from '../../test/formatter_helpers'
45

56
export function normalizeText(text: string): string {

‎features/support/hooks.ts

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
1-
import { After, Before, formatterHelpers } from '../../'
21
import fs from 'fs'
32
import fsExtra from 'fs-extra'
43
import path from 'path'
54
import tmp from 'tmp'
6-
import { doesHaveValue } from '../../src/value_checker'
7-
import { World } from './world'
5+
6+
import { After, Before, formatterHelpers } from '../../'
87
import { ITestCaseHookParameter } from '../../src/support_code_library_builder/types'
8+
import { doesHaveValue } from '../../src/value_checker'
99
import { warnUserAboutEnablingDeveloperMode } from './warn_user_about_enabling_developer_mode'
10+
import { World } from './world'
1011

1112
const projectPath = path.join(__dirname, '..', '..')
1213

‎features/support/message_helpers.ts

+5-4
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
1+
import * as messages from '@cucumber/messages'
2+
import { getWorstTestStepResult } from '@cucumber/messages'
3+
import { Query } from '@cucumber/query'
4+
import util from 'util'
5+
16
import { getGherkinStepMap } from '../../src/formatter/helpers/gherkin_document_parser'
27
import {
38
getPickleStepMap,
49
getStepKeyword,
510
} from '../../src/formatter/helpers/pickle_parser'
6-
import util from 'util'
7-
import * as messages from '@cucumber/messages'
8-
import { Query } from '@cucumber/query'
911
import { doesHaveValue, doesNotHaveValue } from '../../src/value_checker'
10-
import { getWorstTestStepResult } from '@cucumber/messages'
1112

1213
export interface IStepTextAndResult {
1314
text: string

‎features/support/warn_user_about_enabling_developer_mode.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import { reindent } from 'reindent-template-literals'
21
import colors from 'colors/safe'
2+
import { reindent } from 'reindent-template-literals'
33

44
export function warnUserAboutEnablingDeveloperMode(error: any): void {
55
if (!(error?.code === 'EPERM')) {

‎features/support/world.ts

+9-8
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,18 @@
1-
import { Cli, setWorldConstructor } from '../../'
2-
import { execFile } from 'child_process'
1+
import * as messageStreams from '@cucumber/message-streams'
2+
import * as messages from '@cucumber/messages'
33
import { expect } from 'chai'
4-
import toString from 'stream-to-string'
5-
import { PassThrough, pipeline, Writable } from 'stream'
4+
import { execFile } from 'child_process'
65
import colors from 'colors/safe'
76
import fs from 'fs'
87
import path from 'path'
8+
import { PassThrough, pipeline, Writable } from 'stream'
9+
import toString from 'stream-to-string'
10+
import util from 'util'
911
import VError from 'verror'
10-
import * as messages from '@cucumber/messages'
11-
import * as messageStreams from '@cucumber/message-streams'
12-
import FakeReportServer from '../../test/fake_report_server'
12+
13+
import { Cli, setWorldConstructor } from '../../'
1314
import { doesHaveValue } from '../../src/value_checker'
14-
import util from 'util'
15+
import FakeReportServer from '../../test/fake_report_server'
1516

1617
const asyncPipeline = util.promisify(pipeline)
1718

‎src/cli/argv_parser.ts

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1+
import { dialects } from '@cucumber/gherkin'
12
import { Command } from 'commander'
23
import path from 'path'
3-
import { dialects } from '@cucumber/gherkin'
4-
import { SnippetInterface } from '../formatter/step_definition_snippet_builder/snippet_syntax'
4+
55
import Formatters from '../formatter/helpers/formatters'
6+
import { SnippetInterface } from '../formatter/step_definition_snippet_builder/snippet_syntax'
67

78
// Using require instead of import so compiled typescript will have the desired folder structure
89
const { version } = require('../../package.json') // eslint-disable-line @typescript-eslint/no-var-requires

‎src/cli/configuration_builder.ts

+7-6
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
1-
import ArgvParser, {
2-
IParsedArgvFormatOptions,
3-
IParsedArgvOptions,
4-
} from './argv_parser'
1+
import glob from 'glob'
52
import fs from 'mz/fs'
63
import path from 'path'
7-
import OptionSplitter from './option_splitter'
8-
import glob from 'glob'
94
import { promisify } from 'util'
5+
106
import { IPickleFilterOptions } from '../pickle_filter'
117
import { IRuntimeOptions } from '../runtime'
128
import { valueOrDefault } from '../value_checker'
9+
import ArgvParser, {
10+
IParsedArgvFormatOptions,
11+
IParsedArgvOptions,
12+
} from './argv_parser'
13+
import OptionSplitter from './option_splitter'
1314

1415
export interface IConfigurationFormat {
1516
outputTo: string

‎src/cli/configuration_builder_spec.ts

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
1-
import { describe, it } from 'mocha'
21
import { expect } from 'chai'
3-
import ConfigurationBuilder from './configuration_builder'
42
import fsExtra from 'fs-extra'
3+
import { describe, it } from 'mocha'
54
import path from 'path'
65
import tmp, { DirOptions } from 'tmp'
76
import { promisify } from 'util'
7+
88
import { SnippetInterface } from '../formatter/step_definition_snippet_builder/snippet_syntax'
9+
import ConfigurationBuilder from './configuration_builder'
910

1011
async function buildTestWorkingDirectory(): Promise<string> {
1112
const cwd = await promisify<DirOptions, string>(tmp.dir)({

‎src/cli/helpers.ts

+12-11
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,20 @@
1-
import ArgvParser from './argv_parser'
2-
import ProfileLoader from './profile_loader'
3-
import shuffle from 'knuth-shuffle-seeded'
4-
import { EventEmitter } from 'events'
5-
import PickleFilter from '../pickle_filter'
6-
import { EventDataCollector } from '../formatter/helpers'
7-
import { doesHaveValue } from '../value_checker'
8-
import OptionSplitter from './option_splitter'
9-
import { Readable } from 'stream'
1+
import createMeta from '@cucumber/create-meta'
102
import { IdGenerator } from '@cucumber/messages'
113
import * as messages from '@cucumber/messages'
12-
import createMeta from '@cucumber/create-meta'
13-
import { ISupportCodeLibrary } from '../support_code_library_builder/types'
4+
import { EventEmitter } from 'events'
5+
import shuffle from 'knuth-shuffle-seeded'
6+
import { Readable } from 'stream'
7+
8+
import { EventDataCollector } from '../formatter/helpers'
149
import TestCaseHookDefinition from '../models/test_case_hook_definition'
1510
import TestRunHookDefinition from '../models/test_run_hook_definition'
11+
import PickleFilter from '../pickle_filter'
1612
import { builtinParameterTypes } from '../support_code_library_builder'
13+
import { ISupportCodeLibrary } from '../support_code_library_builder/types'
14+
import { doesHaveValue } from '../value_checker'
15+
import ArgvParser from './argv_parser'
16+
import OptionSplitter from './option_splitter'
17+
import ProfileLoader from './profile_loader'
1718

1819
export interface IGetExpandedArgvRequest {
1920
argv: string[]

0 commit comments

Comments
 (0)