chore(toolkit): prevent unintended public exports, file re-org

packages/@aws-cdk/toolkit/.gitignore

@@ -1,28 +1,31 @@
+# Build artifacts
 *.js
 *.js.map
 *.d.ts
 *.d.ts.map
 *.gz
 node_modules
+npm-shrinkwrap.json
+tsconfig.tsbuildinfo
 dist
 .jsii
+docs
 
-# Generated by generate.sh
-build-info.json
-
+# Test artifacts
+assets.json
+junit.xml
 .LAST_BUILD
 .nyc_output
 coverage
 nyc.config.js
 .LAST_PACKAGE
 *.snk
 
-assets.json
-npm-shrinkwrap.json
-!.eslintrc.js
-!jest.config.js
-
-junit.xml
-
+# Exclude resources
+build-info.json
 lib/**/*.wasm
 lib/**/*.yaml
+
+# Include config files
+!.eslintrc.js
+!jest.config.js

packages/@aws-cdk/toolkit/.npmignore

@@ -21,9 +21,6 @@ bundle.mjs
 # Explicitly allow all required files
 !build-info.json
 !db.json.gz
-# !lib/main.js
-# !lib/bridge.js
-# !lib/setup-sandbox.js
 # !lib/api/bootstrap/bootstrap-template.yaml
 !*.d.ts
 !*.d.ts.map

packages/@aws-cdk/toolkit/lib/actions/deploy.ts → packages/@aws-cdk/toolkit/lib/actions/deploy/index.ts

@@ -1,5 +1,5 @@
-import { Deployments, StackActivityProgress, WorkGraph } from '../api/aws-cdk';
-import { StackSelector } from '../api/cloud-assembly/stack-selector';
+import { StackActivityProgress } from '../../api/aws-cdk';
+import type { StackSelector } from '../../api/cloud-assembly';
 
 export type DeploymentMethod = DirectDeploymentMethod | ChangeSetDeploymentMethod;
 
@@ -243,36 +243,3 @@ export interface DeployOptions extends BaseDeployOptions {
    */
   readonly progress?: StackActivityProgress;
 }
-
-export function buildParameterMap(parameters?: Map<string, string | undefined>): { [name: string]: { [name: string]: string | undefined } } {
-  const parameterMap: {
-    [name: string]: { [name: string]: string | undefined };
-  } = {};
-  parameterMap['*'] = {};
-
-  const entries = parameters?.entries() ?? [];
-  for (const [key, value] of entries) {
-    const [stack, parameter] = key.split(':', 2) as [string, string | undefined];
-    if (!parameter) {
-      parameterMap['*'][stack] = value;
-    } else {
-      if (!parameterMap[stack]) {
-        parameterMap[stack] = {};
-      }
-      parameterMap[stack][parameter] = value;
-    }
-  }
-
-  return parameterMap;
-}
-
-/**
- * Remove the asset publishing and building from the work graph for assets that are already in place
- */
-export async function removePublishedAssets(graph: WorkGraph, deployments: Deployments, options: DeployOptions) {
-  await graph.removeUnnecessaryAssets(assetNode => deployments.isSingleAssetPublished(assetNode.assetManifest, assetNode.asset, {
-    stack: assetNode.parentStack,
-    roleArn: options.roleArn,
-    stackName: assetNode.parentStack.stackName,
-  }));
-}

packages/@aws-cdk/toolkit/lib/actions/deploy/private/helpers.ts

@@ -0,0 +1,35 @@
+import { DeployOptions } from '..';
+import { Deployments, WorkGraph } from '../../../api/aws-cdk';
+
+export function buildParameterMap(parameters?: Map<string, string | undefined>): { [name: string]: { [name: string]: string | undefined } } {
+  const parameterMap: {
+    [name: string]: { [name: string]: string | undefined };
+  } = {};
+  parameterMap['*'] = {};
+
+  const entries = parameters?.entries() ?? [];
+  for (const [key, value] of entries) {
+    const [stack, parameter] = key.split(':', 2) as [string, string | undefined];
+    if (!parameter) {
+      parameterMap['*'][stack] = value;
+    } else {
+      if (!parameterMap[stack]) {
+        parameterMap[stack] = {};
+      }
+      parameterMap[stack][parameter] = value;
+    }
+  }
+
+  return parameterMap;
+}
+
+/**
+   * Remove the asset publishing and building from the work graph for assets that are already in place
+   */
+export async function removePublishedAssets(graph: WorkGraph, deployments: Deployments, options: DeployOptions) {
+  await graph.removeUnnecessaryAssets(assetNode => deployments.isSingleAssetPublished(assetNode.assetManifest, assetNode.asset, {
+    stack: assetNode.parentStack,
+    roleArn: options.roleArn,
+    stackName: assetNode.parentStack.stackName,
+  }));
+}

packages/@aws-cdk/toolkit/lib/actions/deploy/private/index.ts

@@ -0,0 +1 @@
+export * from './helpers';

packages/@aws-cdk/toolkit/lib/actions/destroy.ts → packages/@aws-cdk/toolkit/lib/actions/destroy/index.ts

@@ -1,4 +1,4 @@
-import { StackSelector } from '../api/cloud-assembly/stack-selector';
+import type { StackSelector } from '../../api/cloud-assembly';
 
 export interface DestroyOptions {
   /**

packages/@aws-cdk/toolkit/lib/actions/diff.ts → packages/@aws-cdk/toolkit/lib/actions/diff/index.ts

@@ -1,4 +1,4 @@
-import { StackSelector } from '../api/cloud-assembly/stack-selector';
+import type { StackSelector } from '../../api/cloud-assembly';
 
 export interface CloudFormationDiffOptions {
   /**

packages/@aws-cdk/toolkit/lib/actions/import.ts → packages/@aws-cdk/toolkit/lib/actions/import/index.ts

@@ -1,4 +1,4 @@
-import { BaseDeployOptions } from './deploy';
+import type { BaseDeployOptions } from '../deploy';
 
 export interface ImportOptions extends Omit<BaseDeployOptions, 'reuseAssets' | 'hotswap'> {
   /**

packages/@aws-cdk/toolkit/lib/actions/list.ts → packages/@aws-cdk/toolkit/lib/actions/list/index.ts

@@ -1,4 +1,4 @@
-import { StackSelector } from '../api/cloud-assembly/stack-selector';
+import type { StackSelector } from '../../api/cloud-assembly';
 
 export interface ListOptions {
   /**

packages/@aws-cdk/toolkit/lib/actions/rollback.ts → packages/@aws-cdk/toolkit/lib/actions/rollback/index.ts

@@ -1,4 +1,4 @@
-import { StackSelector } from '../api/cloud-assembly';
+import type { StackSelector } from '../../api/cloud-assembly';
 
 export interface RollbackOptions {
   /**

packages/@aws-cdk/toolkit/lib/actions/synth.ts → packages/@aws-cdk/toolkit/lib/actions/synth/index.ts

@@ -1,4 +1,4 @@
-import { StackSelector } from '../api/cloud-assembly/stack-selector';
+import type { StackSelector } from '../../api/cloud-assembly';
 
 export interface SynthOptions {
   /**

packages/@aws-cdk/toolkit/lib/actions/watch.ts → packages/@aws-cdk/toolkit/lib/actions/watch/index.ts

@@ -1,4 +1,4 @@
-import { BaseDeployOptions } from './deploy';
+import type { BaseDeployOptions } from '../deploy';
 
 export interface WatchOptions extends BaseDeployOptions {
   /**

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

@@ -1,9 +1,9 @@
 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 { ToolkitError } from '../../errors';
 import { ActionAwareIoHost, debug } from '../../io/private';
-import { ToolkitServices } from '../../toolkit/private';
 import { ICloudAssemblySource } from '../types';
 
 export interface ContextAwareCloudAssemblyProps {

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

@@ -6,9 +6,9 @@ import * as fs from 'fs-extra';
 import { lte } from 'semver';
 import type { AppSynthOptions } from './source-builder';
 import { prepareDefaultEnvironment as oldPrepare, prepareContext, spaceAvailableForContext, Settings, loadTree, some, splitBySize, versionNumber } from '../../../api/aws-cdk';
+import { ToolkitServices } from '../../../toolkit/private';
 import { ToolkitError } from '../../errors';
 import { ActionAwareIoHost, asLogger, error } from '../../io/private';
-import { ToolkitServices } from '../../toolkit/private';
 
 export { guessExecutable } from '../../../api/aws-cdk';
 

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

@@ -5,10 +5,10 @@ import type { ICloudAssemblySource } from '../';
 import { ContextAwareCloudAssembly, ContextAwareCloudAssemblyProps } from './context-aware-source';
 import { execInChildProcess } from './exec';
 import { assemblyFromDirectory, changeDir, guessExecutable, prepareDefaultEnvironment, withContext, withEnv } from './prepare-source';
+import { ToolkitServices } from '../../../toolkit/private';
 import { Context, ILock, RWLock } from '../../aws-cdk';
 import { ToolkitError } from '../../errors';
 import { debug } from '../../io/private';
-import { ToolkitServices } from '../../toolkit/private';
 
 /**
  * Configuration for creating a CLI from an AWS CDK App directory

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

@@ -7,6 +7,3 @@ export * from './api/aws-auth';
 export * from './api/cloud-assembly';
 export * from './api/io';
 export * from './api/errors';
-
-// shared types
-export * from './api/cloud-assembly/stack-selector';

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

@@ -0,0 +1 @@
+export * from './toolkit';

packages/@aws-cdk/toolkit/lib/api/toolkit/private/index.ts → packages/@aws-cdk/toolkit/lib/toolkit/private/index.ts

@@ -1,6 +1,6 @@
 
-import { SdkProvider } from '../../aws-cdk';
-import { ActionAwareIoHost } from '../../io/private';
+import { SdkProvider } from '../../api/aws-cdk';
+import { ActionAwareIoHost } from '../../api/io/private';
 
 /**
  * Helper struct to pass internal services around.

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

@@ -1,25 +1,24 @@
-
 import * as path from 'node:path';
 import * as cxapi from '@aws-cdk/cx-api';
 import * as chalk from 'chalk';
 import * as chokidar from 'chokidar';
 import * as fs from 'fs-extra';
-import { AssetBuildTime, buildParameterMap, DeployOptions, removePublishedAssets, RequireApproval } from './actions/deploy';
-import { DestroyOptions } from './actions/destroy';
-import { DiffOptions } from './actions/diff';
-import { ListOptions } from './actions/list';
-import { RollbackOptions } from './actions/rollback';
-import { SynthOptions } from './actions/synth';
-import { patternsArrayForWatch, WatchOptions } from './actions/watch';
-import { SdkOptions } from './api/aws-auth';
-import { DEFAULT_TOOLKIT_STACK_NAME, SdkProvider, SuccessfulDeployStackResult, StackCollection, Deployments, HotswapMode, StackActivityProgress, ResourceMigrator, obscureTemplate, serializeStructure, tagsForStack, CliIoHost, validateSnsTopicArn, Concurrency, WorkGraphBuilder, AssetBuildNode, AssetPublishNode, StackNode } from './api/aws-cdk';
-import { CachedCloudAssemblySource, IdentityCloudAssemblySource, StackAssembly, ICloudAssemblySource } from './api/cloud-assembly';
-import { CloudAssemblySourceBuilder } from './api/cloud-assembly/private/source-builder';
-import { StackSelectionStrategy } from './api/cloud-assembly/stack-selector';
-import { ToolkitError } from './api/errors';
-import { IIoHost, IoMessageCode, IoMessageLevel } from './api/io';
-import { asSdkLogger, withAction, Timer, confirm, data, error, highlight, info, success, warn, ActionAwareIoHost, debug } from './api/io/private';
-import { ToolkitServices } from './api/toolkit/private';
+import { ToolkitServices } from './private';
+import { AssetBuildTime, DeployOptions, RequireApproval } from '../actions/deploy';
+import { buildParameterMap, removePublishedAssets } from '../actions/deploy/private';
+import { DestroyOptions } from '../actions/destroy';
+import { DiffOptions } from '../actions/diff';
+import { ListOptions } from '../actions/list';
+import { RollbackOptions } from '../actions/rollback';
+import { SynthOptions } from '../actions/synth';
+import { patternsArrayForWatch, WatchOptions } from '../actions/watch';
+import { SdkOptions } from '../api/aws-auth';
+import { DEFAULT_TOOLKIT_STACK_NAME, SdkProvider, SuccessfulDeployStackResult, StackCollection, Deployments, HotswapMode, StackActivityProgress, ResourceMigrator, obscureTemplate, serializeStructure, tagsForStack, CliIoHost, validateSnsTopicArn, Concurrency, WorkGraphBuilder, AssetBuildNode, AssetPublishNode, StackNode } from '../api/aws-cdk';
+import { CachedCloudAssemblySource, IdentityCloudAssemblySource, StackAssembly, ICloudAssemblySource, StackSelectionStrategy } from '../api/cloud-assembly';
+import { CloudAssemblySourceBuilder } from '../api/cloud-assembly/private/source-builder';
+import { ToolkitError } from '../api/errors';
+import { IIoHost, IoMessageCode, IoMessageLevel } from '../api/io';
+import { asSdkLogger, withAction, Timer, confirm, data, error, highlight, info, success, warn, ActionAwareIoHost, debug } from '../api/io/private';
 
 /**
  * The current action being performed by the CLI. 'none' represents the absence of an action.