Skip to content

Commit 008590b

Browse files
mrgraingithub-actions
and
github-actions
authored
chore: enforce consistent-type-imports everywhere (#229)
We were already enforcing this rule in `toolkit-lib`. Let's enforce it everywhere. --- By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license --------- Signed-off-by: github-actions <[email protected]> Co-authored-by: github-actions <[email protected]>
1 parent f1ef615 commit 008590b

File tree

163 files changed

+579
-451
lines changed

Some content is hidden

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

163 files changed

+579
-451
lines changed

.eslintrc.json

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.projenrc.ts

-2
Original file line numberDiff line numberDiff line change
@@ -729,7 +729,6 @@ tmpToolkitHelpers.package.addField('exports', {
729729

730730
tmpToolkitHelpers.eslint?.addRules({
731731
'@cdklabs/no-throw-default-error': 'error',
732-
'@typescript-eslint/consistent-type-imports': 'error',
733732
});
734733

735734
tmpToolkitHelpers.gitignore.addPatterns('test/**/*.map');
@@ -1218,7 +1217,6 @@ new S3DocsPublishing(toolkitLib, {
12181217
// Eslint rules
12191218
toolkitLib.eslint?.addRules({
12201219
'@cdklabs/no-throw-default-error': 'error',
1221-
'@typescript-eslint/consistent-type-imports': 'error',
12221220
'import/no-restricted-paths': ['error', {
12231221
zones: [{
12241222
target: './',

packages/@aws-cdk/cdk-build-tools/.eslintrc.json

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/@aws-cdk/cdk-build-tools/lib/compile.ts

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import { makeExecutable, shell } from './os';
2-
import { CDKBuildOptions, CompilerOverrides, currentPackageJson, packageCompiler } from './package-info';
3-
import { Timers } from './timer';
2+
import type { CDKBuildOptions, CompilerOverrides } from './package-info';
3+
import { currentPackageJson, packageCompiler } from './package-info';
4+
import type { Timers } from './timer';
45

56
/**
67
* Run the compiler on the current package

packages/@aws-cdk/cdk-build-tools/lib/lint.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ import * as path from 'path';
22
import * as process from 'process';
33
import * as fs from 'fs-extra';
44
import { shell, escape } from './os';
5-
import { CDKBuildOptions, CompilerOverrides } from './package-info';
6-
import { Timers } from './timer';
5+
import type { CDKBuildOptions, CompilerOverrides } from './package-info';
6+
import type { Timers } from './timer';
77

88
export async function lintCurrentPackage(
99
options: CDKBuildOptions,

packages/@aws-cdk/cdk-cli-wrapper/.eslintrc.json

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/@aws-cdk/cdk-cli-wrapper/lib/cdk-wrapper.ts

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
import { ChildProcess } from 'child_process';
2-
import { DefaultCdkOptions, DeployOptions, DestroyOptions, SynthOptions, ListOptions, StackActivityProgress, HotswapMode } from './commands';
1+
import type { ChildProcess } from 'child_process';
2+
import type { DefaultCdkOptions, DeployOptions, DestroyOptions, SynthOptions, ListOptions } from './commands';
3+
import { StackActivityProgress, HotswapMode } from './commands';
34
import { exec, watch } from './utils';
45

56
/**

packages/@aws-cdk/cdk-cli-wrapper/lib/commands/deploy.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { DefaultCdkOptions, RequireApproval } from './common';
1+
import type { DefaultCdkOptions, RequireApproval } from './common';
22

33
/**
44
* Options to use with cdk deploy

packages/@aws-cdk/cdk-cli-wrapper/lib/commands/destroy.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { DefaultCdkOptions } from './common';
1+
import type { DefaultCdkOptions } from './common';
22

33
/**
44
* Options to use with cdk destroy

packages/@aws-cdk/cdk-cli-wrapper/lib/commands/list.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { DefaultCdkOptions } from './common';
1+
import type { DefaultCdkOptions } from './common';
22

33
/**
44
* Options for cdk list

packages/@aws-cdk/cdk-cli-wrapper/lib/commands/synth.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { DefaultCdkOptions } from './common';
1+
import type { DefaultCdkOptions } from './common';
22

33
/**
44
* Options to use with cdk synth

packages/@aws-cdk/cli-lib-alpha/.eslintrc.json

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/@aws-cdk/cli-lib-alpha/lib/cli.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
// eslint-disable-next-line import/no-extraneous-dependencies
2-
import { SharedOptions, DeployOptions, DestroyOptions, BootstrapOptions, SynthOptions, ListOptions, StackActivityProgress, HotswapMode } from './commands';
2+
import type { SharedOptions, DeployOptions, DestroyOptions, BootstrapOptions, SynthOptions, ListOptions } from './commands';
3+
import { StackActivityProgress, HotswapMode } from './commands';
34
import { exec as runCli } from '../../../aws-cdk/lib';
45
// eslint-disable-next-line import/no-extraneous-dependencies
56
import { createAssembly, prepareContext, prepareDefaultEnvironment } from '../../../aws-cdk/lib/api/cxapp/exec';

packages/@aws-cdk/cli-lib-alpha/lib/commands/bootstrap.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { SharedOptions } from './common';
1+
import type { SharedOptions } from './common';
22

33
/**
44
* Options to use with cdk bootstrap

packages/@aws-cdk/cli-lib-alpha/lib/commands/deploy.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { SharedOptions, RequireApproval } from './common';
1+
import type { SharedOptions, RequireApproval } from './common';
22

33
export enum HotswapMode {
44
/**

packages/@aws-cdk/cli-lib-alpha/lib/commands/destroy.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { SharedOptions } from './common';
1+
import type { SharedOptions } from './common';
22

33
/**
44
* Options to use with cdk destroy

packages/@aws-cdk/cli-lib-alpha/lib/commands/list.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { SharedOptions } from './common';
1+
import type { SharedOptions } from './common';
22

33
/**
44
* Options for cdk list

packages/@aws-cdk/cli-lib-alpha/lib/commands/synth.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { SharedOptions } from './common';
1+
import type { SharedOptions } from './common';
22

33
/**
44
* Options to use with cdk synth

packages/@aws-cdk/cli-plugin-contract/.eslintrc.json

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/@aws-cdk/cloud-assembly-schema/.eslintrc.json

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/@aws-cdk/cloud-assembly-schema/lib/assets/docker-image-asset.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { AwsDestination } from './aws-destination';
1+
import type { AwsDestination } from './aws-destination';
22

33
/**
44
* A file asset

packages/@aws-cdk/cloud-assembly-schema/lib/assets/file-asset.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { AwsDestination } from './aws-destination';
1+
import type { AwsDestination } from './aws-destination';
22

33
/**
44
* A file asset

packages/@aws-cdk/cloud-assembly-schema/lib/assets/schema.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import { DockerImageAsset } from './docker-image-asset';
2-
import { FileAsset } from './file-asset';
1+
import type { DockerImageAsset } from './docker-image-asset';
2+
import type { FileAsset } from './file-asset';
33

44
/**
55
* Definitions for the asset manifest

packages/@aws-cdk/cloud-assembly-schema/lib/cloud-assembly/context-queries.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { Tag } from './metadata-schema';
1+
import type { Tag } from './metadata-schema';
22

33
/**
44
* Identifier for the context provider

packages/@aws-cdk/cloud-assembly-schema/lib/cloud-assembly/schema.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import { ArtifactProperties } from './artifact-schema';
2-
import { ContextProvider, ContextQueryProperties } from './context-queries';
3-
import { MetadataEntry } from './metadata-schema';
1+
import type { ArtifactProperties } from './artifact-schema';
2+
import type { ContextProvider, ContextQueryProperties } from './context-queries';
3+
import type { MetadataEntry } from './metadata-schema';
44

55
/**
66
* Type of cloud artifact.

packages/@aws-cdk/cloud-assembly-schema/lib/integ-tests/commands/deploy.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { DefaultCdkOptions, RequireApproval } from './common';
1+
import type { DefaultCdkOptions, RequireApproval } from './common';
22

33
/**
44
* Options to use with cdk deploy

packages/@aws-cdk/cloud-assembly-schema/lib/integ-tests/commands/destroy.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { DefaultCdkOptions } from './common';
1+
import type { DefaultCdkOptions } from './common';
22

33
/**
44
* Options to use with cdk destroy

packages/@aws-cdk/cloud-assembly-schema/lib/integ-tests/schema.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { TestCase } from './test-case';
1+
import type { TestCase } from './test-case';
22
/**
33
* Definitions for the integration testing manifest
44
*/

packages/@aws-cdk/cloud-assembly-schema/lib/integ-tests/test-case.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { DeployOptions, DestroyOptions } from './commands';
1+
import type { DeployOptions, DestroyOptions } from './commands';
22

33
/**
44
* The set of options to control the workflow of the test runner

packages/@aws-cdk/cloud-assembly-schema/lib/manifest.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import * as fs from 'fs';
22
import * as jsonschema from 'jsonschema';
33
import * as semver from 'semver';
4-
import * as assets from './assets';
4+
import type * as assets from './assets';
55
import * as assembly from './cloud-assembly';
6-
import * as integ from './integ-tests';
6+
import type * as integ from './integ-tests';
77

88
/* eslint-disable @typescript-eslint/no-var-requires */
99
/* eslint-disable @typescript-eslint/no-require-imports */

packages/@aws-cdk/cloud-assembly-schema/test/manifest.test.ts

+4-2
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,14 @@ import * as fs from 'fs';
33
import * as os from 'os';
44
import * as path from 'path';
55
import * as semver from 'semver';
6+
import type {
7+
AssemblyManifest,
8+
StackTagsMetadataEntry,
9+
} from '../lib';
610
import {
711
ArtifactType,
8-
AssemblyManifest,
912
ContextProvider,
1013
Manifest,
11-
StackTagsMetadataEntry,
1214
} from '../lib';
1315

1416
const FIXTURES = path.join(__dirname, 'fixtures');

packages/@aws-cdk/cloudformation-diff/.eslintrc.json

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/@aws-cdk/cloudformation-diff/lib/diff/index.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { Resource } from '@aws-cdk/service-spec-types';
1+
import type { Resource } from '@aws-cdk/service-spec-types';
22
import * as types from './types';
33
import { deepEqual, diffKeyedEntities, loadResourceModel } from './util';
44

packages/@aws-cdk/cloudformation-diff/lib/diff/types.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import { AssertionError } from 'assert';
2-
import { PropertyScrutinyType, ResourceScrutinyType, Resource as ResourceModel } from '@aws-cdk/service-spec-types';
2+
import type { Resource as ResourceModel } from '@aws-cdk/service-spec-types';
3+
import { PropertyScrutinyType, ResourceScrutinyType } from '@aws-cdk/service-spec-types';
34
import { deepEqual, loadResourceModel } from './util';
45
import { IamChanges } from '../iam/iam-changes';
56
import { SecurityGroupChanges } from '../network/security-group-changes';

packages/@aws-cdk/cloudformation-diff/lib/diff/util.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { loadAwsServiceSpecSync } from '@aws-cdk/aws-service-spec';
2-
import { Resource, SpecDatabase } from '@aws-cdk/service-spec-types';
2+
import type { Resource, SpecDatabase } from '@aws-cdk/service-spec-types';
33

44
/**
55
* Compares two objects for equality, deeply. The function handles arguments that are

packages/@aws-cdk/cloudformation-diff/lib/format.ts

+5-4
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
import { format } from 'util';
22
import * as chalk from 'chalk';
3-
import { DifferenceCollection, TemplateDiff } from './diff/types';
3+
import type { DifferenceCollection, TemplateDiff } from './diff/types';
44
import { deepEqual } from './diff/util';
5-
import { Difference, isPropertyDifference, ResourceDifference, ResourceImpact } from './diff-template';
5+
import type { Difference, ResourceDifference } from './diff-template';
6+
import { isPropertyDifference, ResourceImpact } from './diff-template';
67
import { formatTable } from './format-table';
7-
import { IamChanges } from './iam/iam-changes';
8-
import { SecurityGroupChanges } from './network/security-group-changes';
8+
import type { IamChanges } from './iam/iam-changes';
9+
import type { SecurityGroupChanges } from './network/security-group-changes';
910

1011
// from cx-api
1112
const PATH_METADATA_KEY = 'aws:cdk:path';

packages/@aws-cdk/cloudformation-diff/lib/iam/iam-changes.ts

+8-5
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
11
import { PropertyScrutinyType, ResourceScrutinyType } from '@aws-cdk/service-spec-types';
22
import * as chalk from 'chalk';
3-
import { ISsoInstanceACAConfig, ISsoPermissionSet, SsoAssignment, SsoInstanceACAConfig, SsoPermissionSet } from './iam-identity-center';
4-
import { ManagedPolicyAttachment, ManagedPolicyJson } from './managed-policy';
5-
import { parseLambdaPermission, parseStatements, Statement, StatementJson } from './statement';
6-
import { MaybeParsed } from '../diff/maybe-parsed';
7-
import { PropertyChange, PropertyMap, ResourceChange } from '../diff/types';
3+
import type { ISsoInstanceACAConfig, ISsoPermissionSet } from './iam-identity-center';
4+
import { SsoAssignment, SsoInstanceACAConfig, SsoPermissionSet } from './iam-identity-center';
5+
import type { ManagedPolicyJson } from './managed-policy';
6+
import { ManagedPolicyAttachment } from './managed-policy';
7+
import type { Statement, StatementJson } from './statement';
8+
import { parseLambdaPermission, parseStatements } from './statement';
9+
import type { MaybeParsed } from '../diff/maybe-parsed';
10+
import type { PropertyChange, PropertyMap, ResourceChange } from '../diff/types';
811
import { DiffableCollection } from '../diffable';
912
import { renderIntrinsics } from '../render-intrinsics';
1013
import { deepRemoveUndefined, dropIfEmpty, flatMap, makeComparator } from '../util';

packages/@aws-cdk/cloudformation-diff/lib/iam/managed-policy.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
import { MaybeParsed, mkParsed } from '../diff/maybe-parsed';
1+
import type { MaybeParsed } from '../diff/maybe-parsed';
2+
import { mkParsed } from '../diff/maybe-parsed';
23

34
export class ManagedPolicyAttachment {
45
public static parseManagedPolicies(identityArn: string, arns: string | string[]): ManagedPolicyAttachment[] {

packages/@aws-cdk/cloudformation-diff/lib/iam/statement.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
import { MaybeParsed, mkParsed, mkUnparseable } from '../diff/maybe-parsed';
1+
import type { MaybeParsed } from '../diff/maybe-parsed';
2+
import { mkParsed, mkUnparseable } from '../diff/maybe-parsed';
23
import { deepRemoveUndefined } from '../util';
34

45
// namespace object imports won't work in the bundle for function exports

packages/@aws-cdk/cloudformation-diff/lib/network/security-group-changes.ts

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import * as chalk from 'chalk';
2-
import { RuleJson, SecurityGroupRule } from './security-group-rule';
3-
import { PropertyChange, ResourceChange } from '../diff/types';
2+
import type { RuleJson } from './security-group-rule';
3+
import { SecurityGroupRule } from './security-group-rule';
4+
import type { PropertyChange, ResourceChange } from '../diff/types';
45
import { DiffableCollection } from '../diffable';
56
import { renderIntrinsics } from '../render-intrinsics';
67
import { deepRemoveUndefined, dropIfEmpty, makeComparator } from '../util';

packages/@aws-cdk/cloudformation-diff/test/iam/detect-changes.test.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import * as chalk from 'chalk';
22
import { fullDiff } from '../../lib';
3-
import { MaybeParsed } from '../../lib/diff/maybe-parsed';
4-
import { IamChangesJson } from '../../lib/iam/iam-changes';
3+
import type { MaybeParsed } from '../../lib/diff/maybe-parsed';
4+
import type { IamChangesJson } from '../../lib/iam/iam-changes';
55
import { deepRemoveUndefined } from '../../lib/util';
66
import { largeSsoPermissionSet, poldoc, policy, resource, role, template } from '../util';
77

packages/@aws-cdk/cloudformation-diff/test/template-and-changeset-diff-merger.test.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { ResourceChangeDetail } from '@aws-sdk/client-cloudformation';
1+
import type { ResourceChangeDetail } from '@aws-sdk/client-cloudformation';
22
import * as utils from './util';
33
import { PropertyDifference, ResourceDifference, ResourceImpact, fullDiff } from '../lib';
44
import { TemplateAndChangeSetDiffMerger } from '../lib/diff/template-and-changeset-diff-merger';

packages/@aws-cdk/cloudformation-diff/test/util.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { Change, DescribeChangeSetOutput } from '@aws-sdk/client-cloudformation';
1+
import type { Change, DescribeChangeSetOutput } from '@aws-sdk/client-cloudformation';
22

33
export function template(resources: {[key: string]: any}) {
44
return { Resources: resources };

packages/@aws-cdk/node-bundle/.eslintrc.json

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/@aws-cdk/node-bundle/src/api/_attributions.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@ import * as fs from 'fs-extra';
33
import type { ModuleInfo } from 'license-checker';
44
import { shell } from './_shell';
55
import type { Package } from './bundle';
6-
import { Violation, ViolationType, ViolationsReport } from './violation';
6+
import type { Violation } from './violation';
7+
import { ViolationType, ViolationsReport } from './violation';
78

89
const ATTRIBUTION_SEPARATOR = '\n----------------\n';
910

packages/@aws-cdk/node-bundle/src/api/bundle.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@ import * as esbuild from 'esbuild';
44
import * as fs from 'fs-extra';
55
import { Attributions } from './_attributions';
66
import { shell } from './_shell';
7-
import { Violation, ViolationType, ViolationsReport } from './violation';
7+
import type { Violation } from './violation';
8+
import { ViolationType, ViolationsReport } from './violation';
89

910
const DEFAULT_ALLOWED_LICENSES = [
1011
'Apache-2.0',

packages/@aws-cdk/node-bundle/src/cli-main.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
import * as path from 'path';
22
import * as fs from 'fs-extra';
33
import * as yargs from 'yargs';
4-
import { Bundle, BundlePackOptions, BundleProps, BundleValidateOptions } from './api';
4+
import type { BundlePackOptions, BundleProps, BundleValidateOptions } from './api';
5+
import { Bundle } from './api';
56

67
function versionNumber(): string {
78
return fs.readJSONSync(path.join(__dirname, '..', 'package.json')).version;

0 commit comments

Comments
 (0)