refactor(cli): re-organize api and utils

.projenrc.ts

@@ -863,7 +863,7 @@ cli.gitignore.addPatterns('build-info.json');
 const cliPackageJson = `${cli.workspaceDirectory}/package.json`;
 
 cli.preCompileTask.prependExec('./generate.sh');
-cli.preCompileTask.prependExec('ts-node scripts/user-input-gen.ts');
+cli.preCompileTask.prependExec('ts-node --prefer-ts-exts scripts/user-input-gen.ts');
 
 const includeCliResourcesCommands = [
   'cp $(node -p \'require.resolve("cdk-from-cfn/index_bg.wasm")\') ./lib/',

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

@@ -8,29 +8,27 @@ export { Settings } from '../../../../aws-cdk/lib/api/settings';
 export { tagsForStack } from '../../../../aws-cdk/lib/api/tags';
 export { DEFAULT_TOOLKIT_STACK_NAME } from '../../../../aws-cdk/lib/api/toolkit-info';
 export { ResourceMigrator } from '../../../../aws-cdk/lib/api/resource-import';
+export { StackActivityProgress } from '../../../../aws-cdk/lib/api/stack-events';
+export { CloudWatchLogEventMonitor, findCloudWatchLogGroups } from '../../../../aws-cdk/lib/api/logs';
+export { WorkGraph, WorkGraphBuilder, AssetBuildNode, AssetPublishNode, StackNode, Concurrency } from '../../../../aws-cdk/lib/api/work-graph';
 
 // Context Providers
 export * as contextproviders from '../../../../aws-cdk/lib/context-providers';
 
+// utils
+export { formatTime } from '../../../../aws-cdk/lib/util/string-manipulation';
+export { formatErrorMessage } from '../../../../aws-cdk/lib/util/format-error';
+export { obscureTemplate, serializeStructure } from '../../../../aws-cdk/lib/util/serialize';
+export { validateSnsTopicArn } from '../../../../aws-cdk/lib/util/cloudformation';
+export { splitBySize } from '../../../../aws-cdk/lib/util/objects';
+
 // @todo APIs not clean import
 export { HotswapMode } from '../../../../aws-cdk/lib/api/hotswap/common';
-export { StackActivityProgress } from '../../../../aws-cdk/lib/api/util/cloudformation/stack-activity-monitor';
+export { HotswapPropertyOverrides, EcsHotswapProperties } from '../../../../aws-cdk/lib/api/hotswap/common';
 export { RWLock, type ILock } from '../../../../aws-cdk/lib/api/util/rwlock';
-export { formatTime } from '../../../../aws-cdk/lib/api/util/string-manipulation';
 
 // @todo Not yet API probably should be
-export { formatErrorMessage } from '../../../../aws-cdk/lib/util/error';
-export { obscureTemplate, serializeStructure } from '../../../../aws-cdk/lib/serialize';
 export { loadTree, some } from '../../../../aws-cdk/lib/tree';
-export { splitBySize } from '../../../../aws-cdk/lib/util';
-export { validateSnsTopicArn } from '../../../../aws-cdk/lib/util/validate-notification-arn';
-export { WorkGraph } from '../../../../aws-cdk/lib/util/work-graph';
-export type { Concurrency } from '../../../../aws-cdk/lib/util/work-graph';
-export { WorkGraphBuilder } from '../../../../aws-cdk/lib/util/work-graph-builder';
-export type { AssetBuildNode, AssetPublishNode, StackNode } from '../../../../aws-cdk/lib/util/work-graph-types';
-export { CloudWatchLogEventMonitor } from '../../../../aws-cdk/lib/api/logs/logs-monitor';
-export { findCloudWatchLogGroups } from '../../../../aws-cdk/lib/api/logs/find-cloudwatch-logs';
-export { HotswapPropertyOverrides, EcsHotswapProperties } from '../../../../aws-cdk/lib/api/hotswap/common';
 
 // @todo Cloud Assembly and Executable - this is a messy API right now
 export { CloudAssembly, sanitizePatterns, type StackDetails, StackCollection, ExtendedStackSelection } from '../../../../aws-cdk/lib/api/cxapp/cloud-assembly';

packages/@aws-cdk/toolkit-lib/lib/api/cloud-assembly/private/context-aware-source.ts

@@ -1,7 +1,7 @@
 import type { MissingContext } from '@aws-cdk/cloud-assembly-schema';
 import * as cxapi from '@aws-cdk/cx-api';
 import { ToolkitServices } from '../../../toolkit/private';
-import { Context, contextproviders, PROJECT_CONTEXT } from '../../aws-cdk';
+import { type Context, contextproviders, PROJECT_CONTEXT } from '../../aws-cdk';
 import { ToolkitError } from '../../errors';
 import { ActionAwareIoHost, debug } from '../../io/private';
 import { ICloudAssemblySource } from '../types';

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

@@ -4,7 +4,7 @@ import type { AwsCredentialIdentity, AwsCredentialIdentityProvider } from '@smit
 import { credentialsAboutToExpire, makeCachingProvider } from './provider-caching';
 import { debug, warning } from '../../logging';
 import { AuthenticationError } from '../../toolkit/error';
-import { formatErrorMessage } from '../../util/error';
+import { formatErrorMessage } from '../../util/format-error';
 import { Mode } from '../plugin/mode';
 import { PluginHost } from '../plugin/plugin';
 

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

@@ -1,7 +1,7 @@
 import { inspect, format } from 'util';
 import { Logger } from '@smithy/types';
-import { replacerBufferWithInfo } from '../../serialize';
 import type { IIoHost } from '../../toolkit/cli-io-host';
+import { replacerBufferWithInfo } from '../../util/serialize';
 
 export class SdkToCliLogger implements Logger {
   private readonly ioHost: IIoHost;

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

@@ -13,7 +13,7 @@ import { SDK } from './sdk';
 import { callTrace, traceMemberMethods } from './tracing';
 import { debug, warning } from '../../logging';
 import { AuthenticationError } from '../../toolkit/error';
-import { formatErrorMessage } from '../../util/error';
+import { formatErrorMessage } from '../../util/format-error';
 import { Mode } from '../plugin/mode';
 
 export type AssumeRoleAdditionalOptions = Partial<Omit<AssumeRoleCommandInput, 'ExternalId' | 'RoleArn'>>;

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

@@ -321,7 +321,7 @@ import { traceMemberMethods } from './tracing';
 import { defaultCliUserAgent } from './user-agent';
 import { debug } from '../../logging';
 import { AuthenticationError } from '../../toolkit/error';
-import { formatErrorMessage } from '../../util/error';
+import { formatErrorMessage } from '../../util/format-error';
 
 export interface S3ClientOptions {
   /**

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

@@ -5,10 +5,10 @@ import type { BootstrapEnvironmentOptions, BootstrappingParameters } from './boo
 import { BootstrapStack, bootstrapVersionFromTemplate } from './deploy-bootstrap';
 import { legacyBootstrapTemplate } from './legacy-template';
 import { warn } from '../../cli/messages';
-import { loadStructuredFile, serializeStructure } from '../../serialize';
 import { IoMessaging } from '../../toolkit/cli-io-host';
 import { ToolkitError } from '../../toolkit/error';
 import { rootDir } from '../../util/directories';
+import { loadStructuredFile, serializeStructure } from '../../util/serialize';
 import type { SDK, SdkProvider } from '../aws-auth';
 import type { SuccessfulDeployStackResult } from '../deployments';
 import { Mode } from '../plugin/mode';

packages/aws-cdk/lib/api/deployments/cloudformation.ts

@@ -12,14 +12,14 @@ import {
 } from '@aws-sdk/client-cloudformation';
 import { AssetManifest, FileManifestEntry } from 'cdk-assets';
 import { AssetManifestBuilder } from './asset-manifest-builder';
+import type { Deployments } from './deployments';
 import { debug } from '../../cli/messages';
-import { deserializeStructure } from '../../serialize';
 import { IoMessaging } from '../../toolkit/cli-io-host';
 import { ToolkitError } from '../../toolkit/error';
-import { formatErrorMessage } from '../../util/error';
+import { formatErrorMessage } from '../../util/format-error';
+import { deserializeStructure } from '../../util/serialize';
 import type { ICloudFormationClient, SdkProvider } from '../aws-auth';
-import type { Deployments } from './deployments';
-import { StackStatus } from '../util/cloudformation/stack-status';
+import { StackStatus } from '../stack-events';
 import { makeBodyParameter, TemplateBodyParameter } from '../util/template-body-parameter';
 
 export type ResourcesToImport = ResourceToImport[];

packages/aws-cdk/lib/api/deployments/deploy-stack.ts

@@ -31,12 +31,12 @@ import { tryHotswapDeployment } from './hotswap-deployments';
 import { debug, info, warn } from '../../cli/messages';
 import { IIoHost, IoMessaging, ToolkitAction } from '../../toolkit/cli-io-host';
 import { ToolkitError } from '../../toolkit/error';
-import { formatErrorMessage } from '../../util/error';
+import { formatErrorMessage } from '../../util/format-error';
 import type { SDK, SdkProvider, ICloudFormationClient } from '../aws-auth';
 import type { EnvironmentResources } from '../environment';
 import { CfnEvaluationException } from '../evaluate-cloudformation-template';
 import { HotswapMode, HotswapPropertyOverrides, ICON } from '../hotswap/common';
-import { StackActivityMonitor, type StackActivityProgress } from '../util/cloudformation/stack-activity-monitor';
+import { StackActivityMonitor, type StackActivityProgress } from '../stack-events';
 import { StringWithoutPlaceholders } from '../util/placeholders';
 import { type TemplateBodyParameter, makeBodyParameter } from '../util/template-body-parameter';
 

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

@@ -27,15 +27,13 @@ import {
 import { debug, warn } from '../../cli/messages';
 import { IIoHost, IoMessaging, ToolkitAction } from '../../toolkit/cli-io-host';
 import { ToolkitError } from '../../toolkit/error';
-import { formatErrorMessage } from '../../util/error';
+import { formatErrorMessage } from '../../util/format-error';
 import type { SdkProvider } from '../aws-auth/sdk-provider';
 import { type EnvironmentResources, EnvironmentAccess } from '../environment';
 import { HotswapMode, HotswapPropertyOverrides } from '../hotswap/common';
+import { StackActivityMonitor, StackActivityProgress, StackEventPoller, RollbackChoice } from '../stack-events';
 import type { Tag } from '../tags';
 import { DEFAULT_TOOLKIT_STACK_NAME } from '../toolkit-info';
-import { StackActivityMonitor, StackActivityProgress } from '../util/cloudformation/stack-activity-monitor';
-import { StackEventPoller } from '../util/cloudformation/stack-event-poller';
-import { RollbackChoice } from '../util/cloudformation/stack-status';
 import { makeBodyParameter } from '../util/template-body-parameter';
 
 const BOOTSTRAP_STACK_VERSION_FOR_ROLLBACK = 23;

packages/aws-cdk/lib/api/deployments/hotswap-deployments.ts

@@ -8,7 +8,7 @@ import type { CloudFormationStack } from './cloudformation';
 import { NestedStackTemplates, loadCurrentTemplateWithNestedStacks } from './nested-stack-helpers';
 import { info } from '../../cli/messages';
 import { ToolkitError } from '../../toolkit/error';
-import { formatErrorMessage } from '../../util/error';
+import { formatErrorMessage } from '../../util/format-error';
 import { EvaluateCloudFormationTemplate } from '../evaluate-cloudformation-template';
 import { isHotswappableAppSyncChange } from '../hotswap/appsync-mapping-templates';
 import { isHotswappableCodeBuildProjectChange } from '../hotswap/code-build-projects';

packages/aws-cdk/lib/api/deployments/nested-stack-helpers.ts

@@ -3,7 +3,7 @@ import type { CloudFormationStackArtifact } from '@aws-cdk/cx-api';
 import * as fs from 'fs-extra';
 import type { SDK } from '../aws-auth';
 import { CloudFormationStack, type Template } from './cloudformation';
-import { formatErrorMessage } from '../../util/error';
+import { formatErrorMessage } from '../../util/format-error';
 import { LazyListStackResources, type ListStackResources } from '../evaluate-cloudformation-template';
 
 export interface NestedStackTemplates {

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

@@ -4,7 +4,7 @@ import { EnvironmentResources, EnvironmentResourcesRegistry } from './environmen
 import { warn } from '../../cli/messages';
 import { IoMessaging } from '../../toolkit/cli-io-host';
 import { ToolkitError } from '../../toolkit/error';
-import { formatErrorMessage } from '../../util/error';
+import { formatErrorMessage } from '../../util/format-error';
 import { CredentialsOptions, SdkForEnvironment, SdkProvider } from '../aws-auth/sdk-provider';
 import { Mode } from '../plugin/mode';
 import { replaceEnvPlaceholders, StringWithoutPlaceholders } from '../util/placeholders';

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

@@ -3,7 +3,7 @@ import { debug, warn } from '../../cli/messages';
 import { Notices } from '../../notices';
 import { IoMessaging } from '../../toolkit/cli-io-host';
 import { ToolkitError } from '../../toolkit/error';
-import { formatErrorMessage } from '../../util/error';
+import { formatErrorMessage } from '../../util/format-error';
 import type { SDK } from '../aws-auth';
 import { type EcrRepositoryInfo, ToolkitInfo } from '../toolkit-info';
 

packages/aws-cdk/lib/api/logs/find-cloudwatch-logs.ts

@@ -2,7 +2,7 @@ import type { CloudFormationStackArtifact, Environment } from '@aws-cdk/cx-api';
 import type { StackResourceSummary } from '@aws-sdk/client-cloudformation';
 import { debug } from '../../logging';
 import { IoMessaging } from '../../toolkit/cli-io-host';
-import { formatErrorMessage } from '../../util/error';
+import { formatErrorMessage } from '../../util/format-error';
 import type { SDK, SdkProvider } from '../aws-auth';
 import { EnvironmentAccess } from '../environment';
 import { EvaluateCloudFormationTemplate, LazyListStackResources } from '../evaluate-cloudformation-template';

packages/aws-cdk/lib/api/logs/index.ts

@@ -0,0 +1,2 @@
+export * from './logs-monitor';
+export * from './find-cloudwatch-logs';

packages/aws-cdk/lib/api/resource-import/importer.ts

@@ -9,8 +9,8 @@ import { error, info, warn } from '../../cli/messages';
 import { IIoHost, ToolkitAction } from '../../toolkit/cli-io-host';
 import { ToolkitError } from '../../toolkit/error';
 import { assertIsSuccessfulDeployStackResult, type Deployments, DeploymentMethod, ResourceIdentifierProperties, ResourcesToImport } from '../deployments';
-import { Tag } from '../tags';
-import { StackActivityProgress } from '../util/cloudformation/stack-activity-monitor';
+import type { StackActivityProgress } from '../stack-events';
+import type { Tag } from '../tags';
 
 export interface ResourceImporterProps {
   deployments: Deployments;

packages/aws-cdk/lib/api/resource-import/migrator.ts

@@ -4,9 +4,9 @@ import * as fs from 'fs-extra';
 import { ImportDeploymentOptions, ResourceImporter } from './importer';
 import { info } from '../../cli/messages';
 import type { IIoHost, ToolkitAction } from '../../toolkit/cli-io-host';
+import { formatTime } from '../../util/string-manipulation';
 import { StackCollection } from '../cxapp/cloud-assembly';
 import type { Deployments, ResourcesToImport } from '../deployments';
-import { formatTime } from '../util/string-manipulation';
 
 export interface ResourceMigratorProps {
   deployments: Deployments;

packages/aws-cdk/lib/api/stack-events/index.ts

@@ -0,0 +1,3 @@
+export * from './stack-activity-monitor';
+export * from './stack-event-poller';
+export * from './stack-status';

packages/aws-cdk/lib/api/util/cloudformation/stack-activity-monitor.ts → packages/aws-cdk/lib/api/stack-events/stack-activity-monitor.ts

@@ -3,10 +3,10 @@ import { ArtifactMetadataEntryType, type MetadataEntry } from '@aws-cdk/cloud-as
 import type { CloudFormationStackArtifact } from '@aws-cdk/cx-api';
 import * as chalk from 'chalk';
 import { ResourceEvent, StackEventPoller } from './stack-event-poller';
-import { error, info } from '../../../logging';
-import { CliIoHost, IoMessageLevel } from '../../../toolkit/cli-io-host';
-import type { ICloudFormationClient } from '../../aws-auth';
-import { RewritableBlock } from '../display';
+import { error, info } from '../../logging';
+import { CliIoHost, IoMessageLevel } from '../../toolkit/cli-io-host';
+import type { ICloudFormationClient } from '../aws-auth';
+import { RewritableBlock } from './display';
 
 export interface StackActivity extends ResourceEvent {
   readonly metadata?: ResourceMetadata;

packages/aws-cdk/lib/api/util/cloudformation/stack-event-poller.ts → packages/aws-cdk/lib/api/stack-events/stack-event-poller.ts

@@ -1,6 +1,6 @@
 import type { StackEvent } from '@aws-sdk/client-cloudformation';
-import { formatErrorMessage } from '../../../util/error';
-import type { ICloudFormationClient } from '../../aws-auth';
+import { formatErrorMessage } from '../../util/format-error';
+import type { ICloudFormationClient } from '../aws-auth';
 
 export interface StackEventPollerProps {
   /**

packages/aws-cdk/lib/api/util/template-body-parameter.ts

@@ -5,9 +5,9 @@ import { getEndpointFromInstructions } from '@smithy/middleware-endpoint';
 import * as chalk from 'chalk';
 import * as fs from 'fs-extra';
 import { debug, error } from '../../logging';
-import { toYAML } from '../../serialize';
 import { ToolkitError } from '../../toolkit/error';
 import { contentHash } from '../../util/content-hash';
+import { toYAML } from '../../util/serialize';
 import { type AssetManifestBuilder } from '../deployments';
 import { EnvironmentResources } from '../environment';
 

packages/aws-cdk/lib/api/work-graph/index.ts

@@ -0,0 +1,3 @@
+export * from './work-graph';
+export * from './work-graph-builder';
+export * from './work-graph-types';

packages/aws-cdk/lib/util/work-graph-builder.ts → packages/aws-cdk/lib/api/work-graph/work-graph-builder.ts

@@ -1,9 +1,9 @@
 import * as cxapi from '@aws-cdk/cx-api';
 import { AssetManifest, type IManifestEntry } from 'cdk-assets';
-import { contentHashAny } from './content-hash';
 import { WorkGraph } from './work-graph';
 import { DeploymentState, AssetBuildNode, WorkNode } from './work-graph-types';
-import { ToolkitError } from '../toolkit/error';
+import { ToolkitError } from '../../toolkit/error';
+import { contentHashAny } from '../../util/content-hash';
 
 export class WorkGraphBuilder {
   /**

packages/aws-cdk/lib/util/work-graph.ts → packages/aws-cdk/lib/api/work-graph/work-graph.ts

@@ -1,7 +1,7 @@
-import { parallelPromises } from './parallel';
 import { WorkNode, DeploymentState, StackNode, AssetBuildNode, AssetPublishNode } from './work-graph-types';
-import { debug, trace } from '../logging';
-import { ToolkitError } from '../toolkit/error';
+import { debug, trace } from '../../logging';
+import { ToolkitError } from '../../toolkit/error';
+import { parallelPromises } from '../../util/parallel';
 
 export type Concurrency = number | Record<WorkNode['type'], number>;
 

packages/aws-cdk/lib/cli/cdk-toolkit.ts

@@ -25,9 +25,10 @@ import { HotswapMode, HotswapPropertyOverrides, EcsHotswapProperties } from '../
 import { findCloudWatchLogGroups } from '../api/logs/find-cloudwatch-logs';
 import { CloudWatchLogEventMonitor } from '../api/logs/logs-monitor';
 import { ResourceImporter, removeNonImportResources, ResourceMigrator } from '../api/resource-import';
+import { StackActivityProgress } from '../api/stack-events';
 import { tagsForStack, type Tag } from '../api/tags';
-import { StackActivityProgress } from '../api/util/cloudformation/stack-activity-monitor';
-import { formatTime } from '../api/util/string-manipulation';
+import { type AssetBuildNode, type AssetPublishNode, type Concurrency, type StackNode, WorkGraph } from '../api/work-graph';
+import { WorkGraphBuilder } from '../api/work-graph/work-graph-builder';
 import {
   generateCdkApp,
   generateStack,
@@ -49,15 +50,13 @@ import {
 import { printSecurityDiff, printStackDiff, RequireApproval } from '../diff';
 import { listStacks } from '../list-stacks';
 import { result as logResult, debug, error, highlight, info, success, warning } from '../logging';
-import { deserializeStructure, obscureTemplate, serializeStructure } from '../serialize';
 import { CliIoHost } from '../toolkit/cli-io-host';
 import { ToolkitError } from '../toolkit/error';
 import { numberFromBool, partition } from '../util';
-import { formatErrorMessage } from '../util/error';
-import { validateSnsTopicArn } from '../util/validate-notification-arn';
-import { Concurrency, WorkGraph } from '../util/work-graph';
-import { WorkGraphBuilder } from '../util/work-graph-builder';
-import { AssetBuildNode, AssetPublishNode, StackNode } from '../util/work-graph-types';
+import { validateSnsTopicArn } from '../util/cloudformation';
+import { formatErrorMessage } from '../util/format-error';
+import { deserializeStructure, obscureTemplate, serializeStructure } from '../util/serialize';
+import { formatTime } from '../util/string-manipulation';
 
 // Must use a require() otherwise esbuild complains about calling a namespace
 // eslint-disable-next-line @typescript-eslint/no-require-imports

packages/aws-cdk/lib/cli/cli-config.ts

@@ -1,7 +1,7 @@
 // eslint-disable-next-line import/no-extraneous-dependencies
 import { CliHelpers, type CliConfig } from '@aws-cdk/user-input-gen';
 import * as cdk_from_cfn from 'cdk-from-cfn';
-import { StackActivityProgress } from '../api/util/cloudformation/stack-activity-monitor';
+import { StackActivityProgress } from '../api/stack-events';
 import { RequireApproval } from '../diff';
 import { availableInitLanguages } from '../init';
 

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

@@ -1,11 +1,11 @@
 import * as chalk from 'chalk';
 import { minimatch } from 'minimatch';
 import { Context } from '../api/context';
+import { renderTable } from '../cli/tables';
 import { PROJECT_CONFIG, PROJECT_CONTEXT, USER_DEFAULTS } from '../cli/user-configuration';
 import * as version from '../cli/version';
 import { error, warning, info, result } from '../logging';
 import { ToolkitError } from '../toolkit/error';
-import { renderTable } from '../util';
 
 /**
  * Options for the context command