Skip to content

Commit fded7cc

Browse files
committed
refactor: split basic-io module into a module for each method
1 parent cecdfd8 commit fded7cc

32 files changed

+846
-676
lines changed

src/__tests__/commands/apps.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import { AppClassification, AppResponse, AppType, AppsEndpoint, PagedApp, SmartT
77
import { APICommand, APICommandFlags, apiCommand, apiCommandBuilder, apiDocsURL } from '../../lib/command/api-command.js'
88
import { outputItemOrList, outputItemOrListBuilder } from '../../lib/command/listing-io.js'
99
import { CommandArgs } from '../../commands/apps.js'
10-
import { ListDataFunction } from '../../lib/command/basic-io.js'
10+
import { ListDataFunction } from '../../lib/command/io-defs.js'
1111
import { BuildOutputFormatterFlags } from '../../lib/command/output-builder.js'
1212
import { SmartThingsCommandFlags } from '../../lib/command/smartthings-command.js'
1313
import { shortARNorURL, verboseApps } from '../../lib/command/util/apps-util.js'

src/__tests__/commands/config.test.ts

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,11 @@ import { ArgumentsCamelCase, Argv } from 'yargs'
44

55
import { Profile, ProfilesByName } from '../../lib/cli-config.js'
66
import { CommandArgs } from '../../commands/config.js'
7-
import { outputItem, outputList, outputListBuilder } from '../../lib/command/basic-io.js'
87
import { stringTranslateToId } from '../../lib/command/command-util.js'
98
import { TableCommonListOutputProducer, TableCommonOutputProducer } from '../../lib/command/format.js'
109
import { outputItemOrListBuilder } from '../../lib/command/listing-io.js'
10+
import { outputItem } from '../../lib/command/output-item.js'
11+
import { outputList, outputListBuilder } from '../../lib/command/output-list.js'
1112
import {
1213
OutputFormatter,
1314
calculateOutputFormat,
@@ -24,14 +25,6 @@ import { ValueTableFieldDefinition } from '../../lib/table-generator.js'
2425
import { buildArgvMock, buildArgvMockStub } from '../test-lib/builder-mock.js'
2526

2627

27-
const outputItemMock = jest.fn<typeof outputItem>()
28-
const outputListMock = jest.fn<typeof outputList>()
29-
jest.unstable_mockModule('../../lib/command/basic-io.js', () => ({
30-
outputListBuilder,
31-
outputItem: outputItemMock,
32-
outputList: outputListMock,
33-
}))
34-
3528
const stringTranslateToIdMock = jest.fn<typeof stringTranslateToId>()
3629
jest.unstable_mockModule('../../lib/command/command-util.js', () => ({
3730
stringTranslateToId: stringTranslateToIdMock,
@@ -42,6 +35,17 @@ jest.unstable_mockModule('../../lib/command/listing-io.js', () => ({
4235
outputItemOrListBuilder: outputItemOrListBuilderMock,
4336
}))
4437

38+
const outputItemMock = jest.fn<typeof outputItem>()
39+
jest.unstable_mockModule('../../lib/command/output-item.js', () => ({
40+
outputItem: outputItemMock,
41+
}))
42+
43+
const outputListMock = jest.fn<typeof outputList>()
44+
jest.unstable_mockModule('../../lib/command/output-list.js', () => ({
45+
outputListBuilder,
46+
outputList: outputListMock,
47+
}))
48+
4549
const calculateOutputFormatMock = jest.fn<typeof calculateOutputFormat>()
4650
const writeOutputMock = jest.fn<typeof writeOutput>()
4751
jest.unstable_mockModule('../../lib/command/output.js', () => ({

src/__tests__/commands/devicepreferences/translations/create.test.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import type {
1818
import type {
1919
inputAndOutputItem,
2020
inputAndOutputItemBuilder,
21-
} from '../../../../lib/command/basic-io.js'
21+
} from '../../../../lib/command/input-and-output-item.js'
2222
import type { chooseDevicePreference } from '../../../../lib/command/util/devicepreferences-util.js'
2323
import {
2424
tableFieldDefinitions,
@@ -35,7 +35,7 @@ jest.unstable_mockModule('../../../../lib/command/api-organization-command.js',
3535

3636
const inputAndOutputItemMock = jest.fn<typeof inputAndOutputItem>()
3737
const inputAndOutputItemBuilderMock = jest.fn<typeof inputAndOutputItemBuilder>()
38-
jest.unstable_mockModule('../../../../lib/command/basic-io.js', () => ({
38+
jest.unstable_mockModule('../../../../lib/command/input-and-output-item.js', () => ({
3939
inputAndOutputItem: inputAndOutputItemMock,
4040
inputAndOutputItemBuilder: inputAndOutputItemBuilderMock,
4141
}))

src/__tests__/commands/locations/create.test.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import {
1212
apiCommandBuilder,
1313
apiDocsURL,
1414
} from '../../../lib/command/api-command.js'
15-
import { inputAndOutputItem, inputAndOutputItemBuilder } from '../../../lib/command/basic-io.js'
15+
import { inputAndOutputItem, inputAndOutputItemBuilder } from '../../../lib/command/input-and-output-item.js'
1616
import { CommandArgs } from '../../../commands/locations/create.js'
1717
import { buildArgvMock, buildArgvMockStub } from '../../test-lib/builder-mock.js'
1818

@@ -32,7 +32,7 @@ jest.unstable_mockModule('../../../lib/command/api-command.js', () => ({
3232

3333
const inputAndOutputItemMock = jest.fn<typeof inputAndOutputItem>()
3434
const inputAndOutputItemBuilderMock = jest.fn<typeof inputAndOutputItemBuilder>()
35-
jest.unstable_mockModule('../../../lib/command/basic-io.js', () => ({
35+
jest.unstable_mockModule('../../../lib/command/input-and-output-item.js', () => ({
3636
inputAndOutputItem: inputAndOutputItemMock,
3737
inputAndOutputItemBuilder: inputAndOutputItemBuilderMock,
3838
}))

src/__tests__/commands/locations/update.test.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import { Location, LocationUpdate, LocationsEndpoint, SmartThingsClient } from '
66

77
import { chooseLocation, tableFieldDefinitions } from '../../../lib/command/util/locations-util.js'
88
import { APICommand, APICommandFlags, apiCommand, apiCommandBuilder, apiDocsURL } from '../../../lib/command/api-command.js'
9-
import { inputAndOutputItem, inputAndOutputItemBuilder } from '../../../lib/command/basic-io.js'
9+
import { inputAndOutputItem, inputAndOutputItemBuilder } from '../../../lib/command/input-and-output-item.js'
1010
import { CommandArgs } from '../../../commands/locations/update.js'
1111
import { buildArgvMock, buildArgvMockStub } from '../../test-lib/builder-mock.js'
1212

@@ -28,7 +28,7 @@ jest.unstable_mockModule('../../../lib/command/api-command.js', () => ({
2828

2929
const inputAndOutputItemMock = jest.fn<typeof inputAndOutputItem>()
3030
const inputAndOutputItemBuilderMock = jest.fn<typeof inputAndOutputItemBuilder>()
31-
jest.unstable_mockModule('../../../lib/command/basic-io.js', () => ({
31+
jest.unstable_mockModule('../../../lib/command/input-and-output-item.js', () => ({
3232
inputAndOutputItem: inputAndOutputItemMock,
3333
inputAndOutputItemBuilder: inputAndOutputItemBuilderMock,
3434
}))

src/__tests__/commands/schema/create.test.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import type {
1717
import type {
1818
inputAndOutputItem,
1919
inputAndOutputItemBuilder,
20-
} from '../../../lib/command/basic-io.js'
20+
} from '../../../lib/command/input-and-output-item.js'
2121
import type { lambdaAuthBuilder } from '../../../lib/command/common-flags.js'
2222
import type { InputProcessor, userInputProcessor } from '../../../lib/command/input-processor.js'
2323
import type {
@@ -53,7 +53,7 @@ jest.unstable_mockModule('../../../lib/command/api-organization-command.js', ()
5353

5454
const inputAndOutputItemMock = jest.fn<typeof inputAndOutputItem>()
5555
const inputAndOutputItemBuilderMock = jest.fn<typeof inputAndOutputItemBuilder>()
56-
jest.unstable_mockModule('../../../lib/command/basic-io.js', () => ({
56+
jest.unstable_mockModule('../../../lib/command/input-and-output-item.js', () => ({
5757
inputAndOutputItem: inputAndOutputItemMock,
5858
inputAndOutputItemBuilder: inputAndOutputItemBuilderMock,
5959
}))

0 commit comments

Comments
 (0)