refactor(cli): re-organize files

Author: mrgrain

.projenrc.ts

@@ -821,8 +821,8 @@ const cli = configureProject(
           '<rootDir>/lib/user-input.ts',
           '<rootDir>/lib/convert-to-user-input.ts',
         ],
-        testEnvironment: './test/jest-bufferedconsole.ts',
-        setupFilesAfterEnv: ['<rootDir>/test/jest-setup-after-env.ts'],
+        testEnvironment: './test/_helpers/jest-bufferedconsole.ts',
+        setupFilesAfterEnv: ['<rootDir>/test/_helpers/jest-setup-after-env.ts'],
       },
     }),
 

packages/@aws-cdk/toolkit-lib/lib/api/aws-cdk.ts

@@ -30,4 +30,4 @@ export { guessExecutable } from '../../../../aws-cdk/lib/api/cxapp/exec';
 
 // @todo Should not use! investigate how to replace
 export { versionNumber } from '../../../../aws-cdk/lib/cli/version';
-export { CliIoHost } from '../../../../aws-cdk/lib/toolkit/cli-io-host';
+export { CliIoHost } from '../../../../aws-cdk/lib/cli/io-host';

packages/aws-cdk/jest.config.json

@@ -8,8 +8,8 @@ import { ProxyAgent } from 'proxy-agent';
 import { makeCachingProvider } from './provider-caching';
 import type { SdkHttpOptions } from './sdk-provider';
 import { readIfPossible } from './util';
+import { AuthenticationError } from '../../../../@aws-cdk/tmp-toolkit-helpers/src/api';
 import { debug } from '../../logging';
-import { AuthenticationError } from '../../toolkit/error';
 
 const DEFAULT_CONNECTION_TIMEOUT = 10000;
 const DEFAULT_TIMEOUT = 300000;

packages/aws-cdk/lib/api/aws-auth/awscli-compatible.ts

@@ -2,8 +2,8 @@ import { inspect } from 'util';
 import type { CredentialProviderSource, ForReading, ForWriting, PluginProviderResult, SDKv2CompatibleCredentials, SDKv3CompatibleCredentialProvider, SDKv3CompatibleCredentials } from '@aws-cdk/cli-plugin-contract';
 import type { AwsCredentialIdentity, AwsCredentialIdentityProvider } from '@smithy/types';
 import { credentialsAboutToExpire, makeCachingProvider } from './provider-caching';
+import { AuthenticationError } from '../../../../@aws-cdk/tmp-toolkit-helpers/src/api';
 import { debug, warning } from '../../logging';
-import { AuthenticationError } from '../../toolkit/error';
 import { formatErrorMessage } from '../../util';
 import type { Mode } from '../plugin/mode';
 import { PluginHost } from '../plugin/plugin';

packages/aws-cdk/lib/api/aws-auth/credential-plugins.ts

@@ -12,8 +12,8 @@ import { CredentialPlugins } from './credential-plugins';
 import { makeCachingProvider } from './provider-caching';
 import { SDK } from './sdk';
 import { callTrace, traceMemberMethods } from './tracing';
+import { AuthenticationError } from '../../../../@aws-cdk/tmp-toolkit-helpers/src/api';
 import { debug, warning } from '../../logging';
-import { AuthenticationError } from '../../toolkit/error';
 import { formatErrorMessage } from '../../util';
 import { Mode } from '../plugin/mode';
 

packages/aws-cdk/lib/api/aws-auth/sdk-provider.ts

@@ -346,8 +346,8 @@ import { cachedAsync } from './cached';
 import type { Account } from './sdk-provider';
 import { traceMemberMethods } from './tracing';
 import { defaultCliUserAgent } from './user-agent';
+import { AuthenticationError } from '../../../../@aws-cdk/tmp-toolkit-helpers/src/api';
 import { debug } from '../../logging';
-import { AuthenticationError } from '../../toolkit/error';
 import { formatErrorMessage } from '../../util';
 
 export interface S3ClientOptions {

packages/aws-cdk/lib/api/aws-auth/sdk.ts

@@ -4,9 +4,9 @@ import type * as cxapi from '@aws-cdk/cx-api';
 import type { BootstrapEnvironmentOptions, BootstrappingParameters } from './bootstrap-props';
 import { BootstrapStack, bootstrapVersionFromTemplate } from './deploy-bootstrap';
 import { legacyBootstrapTemplate } from './legacy-template';
+import { ToolkitError } from '../../../../@aws-cdk/tmp-toolkit-helpers/src/api';
 import type { IoHelper } from '../../../../@aws-cdk/tmp-toolkit-helpers/src/api/io/private';
 import { warn } from '../../cli/messages';
-import { ToolkitError } from '../../toolkit/error';
 import { bundledPackageRootDir, loadStructuredFile, serializeStructure } from '../../util';
 import type { SDK, SdkProvider } from '../aws-auth';
 import type { SuccessfulDeployStackResult } from '../deployments';

packages/aws-cdk/lib/api/bootstrap/bootstrap-environment.ts

@@ -1,5 +1,5 @@
 import { Settings } from './settings';
-import { ToolkitError } from '../toolkit/error';
+import { ToolkitError } from '../../../@aws-cdk/tmp-toolkit-helpers/src/api';
 
 export { TRANSIENT_CONTEXT_KEY } from './settings';
 export const PROJECT_CONTEXT = 'cdk.context.json';

packages/aws-cdk/lib/api/context.ts

@@ -4,8 +4,8 @@ import { type StackDetails } from '@aws-cdk/tmp-toolkit-helpers';
 import * as chalk from 'chalk';
 import { minimatch } from 'minimatch';
 import * as semver from 'semver';
+import { AssemblyError, ToolkitError } from '../../../../@aws-cdk/tmp-toolkit-helpers/src/api';
 import { info } from '../../logging';
-import { AssemblyError, ToolkitError } from '../../toolkit/error';
 import { flatten } from '../../util';
 
 export enum DefaultSelection {