chore(cli): refactor cli.ts to use UserInput

packages/aws-cdk/lib/api/cxapp/cloud-executable.ts

@@ -41,7 +41,7 @@ export class CloudExecutable {
    * Return whether there is an app command from the configuration
    */
   public get hasApp() {
-    return !!this.props.configuration.settings.get(['app']);
+    return !!this.props.configuration.settings.get(['globalOptions', 'app']);
   }
 
   /**
@@ -106,7 +106,7 @@ export class CloudExecutable {
   }
 
   private get canLookup() {
-    return !!(this.props.configuration.settings.get(['lookups']) ?? true);
+    return !!(this.props.configuration.settings.get(['globalOptions', 'lookups']) ?? true);
   }
 }
 

packages/aws-cdk/lib/api/cxapp/exec.ts

@@ -5,6 +5,7 @@ import * as cxschema from '@aws-cdk/cloud-assembly-schema';
 import * as cxapi from '@aws-cdk/cx-api';
 import * as fs from 'fs-extra';
 import * as semver from 'semver';
+import { Command } from '../../command';
 import { debug, warning } from '../../logging';
 import { Configuration, PROJECT_CONFIG, USER_DEFAULTS } from '../../settings';
 import { ToolkitError } from '../../toolkit/error';
@@ -24,12 +25,12 @@ export async function execProgram(aws: SdkProvider, config: Configuration): Prom
   const env = await prepareDefaultEnvironment(aws);
   const context = await prepareContext(config, env);
 
-  const build = config.settings.get(['build']);
+  const build = config.settings.get(['globalOptions', 'build']);
   if (build) {
     await exec(build);
   }
 
-  const app = config.settings.get(['app']);
+  const app = config.settings.get(['globalOptions', 'app']);
   if (!app) {
     throw new ToolkitError(`--app is required either in command-line, in ${PROJECT_CONFIG} or in ${USER_DEFAULTS}`);
   }
@@ -46,7 +47,7 @@ export async function execProgram(aws: SdkProvider, config: Configuration): Prom
 
   const commandLine = await guessExecutable(appToArray(app));
 
-  const outdir = config.settings.get(['output']);
+  const outdir = config.settings.get(['globalOptions', 'output']);
   if (!outdir) {
     throw new ToolkitError('unexpected: --output is required');
   }
@@ -189,39 +190,67 @@ export async function prepareDefaultEnvironment(aws: SdkProvider): Promise<{ [ke
 export async function prepareContext(config: Configuration, env: { [key: string]: string | undefined}) {
   const context = config.context.all;
 
-  const debugMode: boolean = config.settings.get(['debug']) ?? true;
+  const debugMode: boolean = config.settings.get(['globalOptions', 'debug']) ?? true;
   if (debugMode) {
     env.CDK_DEBUG = 'true';
   }
 
-  const pathMetadata: boolean = config.settings.get(['pathMetadata']) ?? true;
+  const pathMetadata: boolean = config.settings.get(['globalOptions', 'pathMetadata']) ?? true;
   if (pathMetadata) {
     context[cxapi.PATH_METADATA_ENABLE_CONTEXT] = true;
   }
 
-  const assetMetadata: boolean = config.settings.get(['assetMetadata']) ?? true;
+  const assetMetadata: boolean = config.settings.get(['globalOptions', 'assetMetadata']) ?? true;
   if (assetMetadata) {
     context[cxapi.ASSET_RESOURCE_METADATA_ENABLED_CONTEXT] = true;
   }
 
-  const versionReporting: boolean = config.settings.get(['versionReporting']) ?? true;
+  const versionReporting: boolean = config.settings.get(['globalOptions', 'versionReporting']) ?? true;
   if (versionReporting) { context[cxapi.ANALYTICS_REPORTING_ENABLED_CONTEXT] = true; }
   // We need to keep on doing this for framework version from before this flag was deprecated.
   if (!versionReporting) { context['aws:cdk:disable-version-reporting'] = true; }
 
-  const stagingEnabled = config.settings.get(['staging']) ?? true;
+  const stagingEnabled = config.settings.get(['globalOptions', 'staging']) ?? true;
   if (!stagingEnabled) {
     context[cxapi.DISABLE_ASSET_STAGING_CONTEXT] = true;
   }
 
-  const bundlingStacks = config.settings.get(['bundlingStacks']) ?? ['**'];
+  const bundlingStacks = setBundlingStacks(config);
   context[cxapi.BUNDLING_STACKS] = bundlingStacks;
 
   debug('context:', context);
 
   return context;
 }
 
+function setBundlingStacks(config: Configuration) {
+  // Command may not exist if we are not executing a CLI command
+  if (!config.command) {
+    return [];
+  }
+
+  const stackCommands = [
+    Command.DEPLOY,
+    Command.DIFF,
+    Command.SYNTH,
+    Command.SYNTHESIZE,
+    Command.WATCH,
+  ];
+
+  // command doesn't operate on a stack selection
+  if (!stackCommands.includes(config.command)) {
+    return [];
+  }
+
+  // If we deploy, diff, synth or watch a list of stacks exclusively we skip
+  // bundling for all other stacks.
+  if (config.settings.get(['globalOptions', 'exclusively']) && config.settings.get([config.command, 'STACKS'])) {
+    return config.settings.get([config.command, 'STACKS']);
+  }
+
+  return ['**'];
+}
+
 /**
  * Make sure the 'app' is an array
  *

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

@@ -641,7 +641,7 @@ export class CdkToolkit {
     // 2. Any file whose name starts with a dot.
     // 3. Any directory's content whose name starts with a dot.
     // 4. Any node_modules and its content (even if it's not a JS/TS project, you might be using a local aws-cli package)
-    const outputDir = this.props.configuration.settings.get(['output']);
+    const outputDir = this.props.configuration.settings.get(['globalOptions', 'output']);
     const watchExcludes = this.patternsArrayForWatch(watchSettings.exclude, {
       rootDir,
       returnRootDirIfEmpty: false,